Enhancement: Outsourced arena creation
Fix: Some minor fixes