Fix some more typos, clean up the TODO

I didn't notice the `TODO` before. =)

(It seems that `index.html` hasn't yet been automatically regenerated?)