Some \todo fixes.

Apparently I don't know what I'm doing and broke everything. Maybe it's better if I use SourceTree from now on. I think this includes more commits than necessary, so don't pull if it's going to break GitHub or your repo.