General fixes

Part of the last big update for the game before turning in