Adding some more TODO notes.
Fixed doc indentation