Further improvments to arena mode.