fixes to stuff
Merge branch 'master' of https://github.com/polseane9067/GDD450