refactoring, added more settings and first preparations towards multiple arenas