Removed some entries from the TODO list
Replacements made with most commonly seen newline

Also minor Parser cleanup
Minor parser cleanup