Untested arena support. A few bug fixes.