Optimization attempt

Just a couple of minor changes that should make the game run a bit better (hopefully). No bug fixes or new features.