Fix typos.

Also includes the changes from #14.