Add arenas.yml support
make a few things work