Updated TODO
Updated some style, added more verbs