Some minor updates to various things
Merge branch 'master' of github.com:Neztor/phd