Updates to game logic & bug fixes