new TODOs, some cleanup