ending Bright Hole Trap, Roy's Castle Go With Yoshi I got mixed up with the level name there, I've reorganised my level list and I should have less trouble finding stuff!
