009.07 Changes to switch code, other mods