Corrected typos
Added TODOs