refactored some level select stuff