Correct a TODO note
Bugs fixed and a bit of cleanup, but still doesn't update templates