Changed a couple things regarding Switches