Add major bug fixes to arena system