Remove some done TODOs and reword/rearrange some others
Merge pull request #89 from Rosuav/todo_done

Remove some done TODOs and reword/rearrange some others