added SW1 & M1 + tweaks that make me happy