diff --git a/PyTeX/build/build/pytex_file.py b/PyTeX/build/build/pytex_file.py
index 46faf2a..3fcd2cb 100644
--- a/PyTeX/build/build/pytex_file.py
+++ b/PyTeX/build/build/pytex_file.py
@@ -72,12 +72,12 @@ class PyTeXSourceFile:
     def format(self, target_root: Union[Path, RelativePath]) -> List[Tuple[RelativePath, FormattingConfig]]:
         if self._formatter is None:
             raise NotImplementedError  # TODO
-        try:
-            configs = self._formatter.format(
-                target_root.path if isinstance(target_root, RelativePath) else target_root
-            )
-        except Exception as e:
-            raise NotImplementedError
+#        try:
+        configs = self._formatter.format(
+            target_root.path if isinstance(target_root, RelativePath) else target_root
+        )
+#        except Exception as e:
+ #           raise NotImplementedError
         rel_configs = [
             (self._relative_path.with_name(filename), config)
             for [filename, config] in configs
diff --git a/PyTeX/format/default_macros.py b/PyTeX/format/default_macros.py
index 8318b6f..d66f8d0 100644
--- a/PyTeX/format/default_macros.py
+++ b/PyTeX/format/default_macros.py
@@ -31,7 +31,7 @@ def get_default_macros(tex_flavour: TeXFlavour):
         ConfigEndMacro(),
         ConfigBeginMacro(),
         MacroCodeBeginMacro(),
-        MacroCodeBeginMacro(),
+        MacroCodeEndMacro(),
     ]
     tex2 = [
         ArgumentMacro(
diff --git a/PyTeX/format/dtx_formatter.py b/PyTeX/format/dtx_formatter.py
index 7aea254..7d4441d 100644
--- a/PyTeX/format/dtx_formatter.py
+++ b/PyTeX/format/dtx_formatter.py
@@ -12,6 +12,7 @@ class DTXFormatter(TexFormatter):
     def dependencies(self) -> List[str]:
         return []  # TODO
 
+    @property
     def future_config(self) -> List[Tuple[str, FormattingConfig]]:
         return []  # TODO