Many typos, somebody should review that.

Please review the changes (especially the commented ones) and merge.