Tightened up various mechanics.