Small cleanup
Added some header docs
Removed a few TODOs (literally!)