FIXES

* stacked switches fixes
* automerger fixes
* other fixes... :/