Add major fixes to arena system