Fixed some bugs, game finishes correctly etc..