Typo in comments fixed
TODO updated