More tweaks and outlining the TODOs