master: final tweaks for playability.