fixed small bugs. cleaned up code.
Merge branch 'master' of https://github.com/Rameos/PSMG_Team_Zitronenkuchen
small changes