Add TODO comment
Rephrase stuff, grammar fixes