Editing, commenting

Have done some editing, not done yet, lemme know if you don't like it.
More to go yet