Corrected documentation comment
Updated TODOs