Updated and removed most TODOs

A couple left, plus a question for @krwenholz