Fixing headings
Fixing up TODOs