Bug fixes throughout the game