Updated TODOs, some cleanup