Fix html

fixes some typos in the html and indents it.

Finally won my struggle with git rebase/merge/amend...