Bugfixes and more arena stuff