Added more stuff to the Arena, including more bonus wave types, also cleaned up the code