Reidentation and minor fixes.
Merge branch 'master' of github.com:terjr/thesis