More work on stage select and weapon get