While at it, I fixed some typos