fixed unswitch messages
added per stage adjustments and more