Fixed comments
Reindented comments
Added TODO comments