Improve various parts of the game