various cleanups based on logs
fixed incorrect reassignment
fixed unswitch overrides