More TODOs
Minor housekeeping