Bugfixes

Fixed some Bugs and the major bug that breaks the whole game. Thanks to Jupiter Hadley find that bug.