Comments, TODOs updated, minor changes
Merged todo.txt