diff --git a/src/pylorax/ltmpl.py b/src/pylorax/ltmpl.py
index 55cfeecd..50bbcfd7 100644
--- a/src/pylorax/ltmpl.py
+++ b/src/pylorax/ltmpl.py
@@ -95,6 +95,7 @@ def rglob(pathname, root="/", fatal=False):
 def rexists(pathname, root=""):
     return True if rglob(pathname, root) else False
 
+# TODO: default to strict mode (fatalerrors=True)
 class LoraxTemplateRunner(object):
     def __init__(self, inroot, outroot, yum=None, fatalerrors=False,
                                         templatedir=None, defaults={}):
@@ -385,7 +386,7 @@ class LoraxTemplateRunner(object):
             try:
                 self.yum.install(pattern=p)
             except Exception as e:
-                # TODO: save exception and re-raise after the loop finishes
+                # FIXME: save exception and re-raise after the loop finishes
                 logger.warn("installpkg %s failed: %s",p,str(e))
 
     def removepkg(self, *pkgs):
diff --git a/src/pylorax/treebuilder.py b/src/pylorax/treebuilder.py
index 6da97543..57cf5302 100644
--- a/src/pylorax/treebuilder.py
+++ b/src/pylorax/treebuilder.py
@@ -167,7 +167,6 @@ class TreeBuilder(object):
             dracut.append("--force")
         # Hush some dracut warnings. TODO: bind-mount proc in place?
         open(joinpaths(self.vars.inroot,"/proc/modules"),"w")
-        # XXX FIXME: add anaconda dracut module!
         for kernel in self.kernels:
             logger.info("rebuilding %s", kernel.initrd.path)
             if backup: