Fix typos and such