Edits, corrections and formatting

As usual, @ycombinator not urgent, but push to prod whenever possible.