Added some TODOs
Small doc fixes