adding TODO notes and cleaning up commenting, as we land