vi messed up my indents, fixing.
Improved some comments