Add S yoke and Mix param, tweak param names and order