fixing stuff and making the arena class to clean the code up