Some documentation TODOs, fixes and tweaks