Fix bug in strings that caused comments to be incorrectly parsed
Clean up code
Update todolist