Rewired <Wildcard> in switches & added minor value changes