Fix typos, and make formatting a little better