Comment typo fixes; Removed outdated TODOs