Finished game, left some small fixes