Further improvements to arena mode.