No more leaving arena, and some other stuff added in