first round of edits

please review @kbastani @jexp 

I tried not to change it too much...
I need my todo's :)