Fixed the bugs so now it plays the game properly, plays it is mediocre though.
merged from remote pull