Mainly at Rest: Optimization update 2

The second part of game optimization.