Fixes for the Todo.txt and Todo.html generators
Refactor and fixes