Make SunnyMenu cancelling easier
The first three waves: okay!
Minor issue fixes, first 3 waves all finished