some fixes
Merge branch 'master' of github.com:dwendelen/Thesis
Last fixes