Merge branch 'Deathmax-pull-request'
fix a few things after merge.