more polishing/dealing with TODOs