Multiple arena support, almost completed. Bug fixes and cleanup.