Classified TODO thing by importance, Improved comments, some Typo