Sort out the table in 4.6.
Merge branch 'jfp' of github.com:lkuper/dissertation into jfp