Edits, corrections and formatting

again, @ycombinator not urgent, but merge when possible.