Fixed some small issues, and added a few other things? Not sure, really need a maptest to change the game flow more
