diff --git a/go4k/asmformat.go b/go4k/asmformat.go
index efb4fe6..9ba3fa1 100644
--- a/go4k/asmformat.go
+++ b/go4k/asmformat.go
@@ -130,35 +130,30 @@ func DeserializeAsm(asmcode string) (*Song, error) {
 			}
 			if inInstrument && strings.HasPrefix(word, "SU_") {
 				unittype := strings.ToLower(word[3:])
-				instrMatch := wordReg.FindStringSubmatch(rest)
-				if instrMatch != nil {
-					stereoMono, instrRest := instrMatch[1], instrMatch[2]
-					stereo := stereoMono == "STEREO"
-					parameters, err := parseParams(instrRest)
-					if err != nil {
-						return nil, fmt.Errorf("Error parsing parameters: %v", err)
-					}
-					if unittype == "oscillator" {
-						match := typeReg.FindStringSubmatch(instrRest)
-						if match == nil {
-							return nil, errors.New("Oscillator should define a type")
-						}
-						switch match[1] {
-						case "SINE":
-							parameters["type"] = Sine
-						case "TRISAW":
-							parameters["type"] = Trisaw
-						case "PULSE":
-							parameters["type"] = Pulse
-						case "GATE":
-							parameters["type"] = Gate
-						case "SAMPLE":
-							parameters["type"] = Sample
-						}
-					}
-					unit := Unit{Type: unittype, Stereo: stereo, Parameters: parameters}
-					instr.Units = append(instr.Units, unit)
+				parameters, err := parseParams(rest)
+				if err != nil {
+					return nil, fmt.Errorf("Error parsing parameters: %v", err)
 				}
+				if unittype == "oscillator" {
+					match := typeReg.FindStringSubmatch(rest)
+					if match == nil {
+						return nil, errors.New("Oscillator should define a type")
+					}
+					switch match[1] {
+					case "SINE":
+						parameters["type"] = Sine
+					case "TRISAW":
+						parameters["type"] = Trisaw
+					case "PULSE":
+						parameters["type"] = Pulse
+					case "GATE":
+						parameters["type"] = Gate
+					case "SAMPLE":
+						parameters["type"] = Sample
+					}
+				}
+				unit := Unit{Type: unittype, Parameters: parameters}
+				instr.Units = append(instr.Units, unit)
 			}
 		}
 	}
@@ -167,7 +162,7 @@ func DeserializeAsm(asmcode string) (*Song, error) {
 			if patch[i].Units[u].Type == "delay" {
 				s := patch[i].Units[u].Parameters["delay"]
 				e := patch[i].Units[u].Parameters["count"]
-				if patch[i].Units[u].Stereo {
+				if patch[i].Units[u].Parameters["stereo"] == 1 {
 					e *= 2 // stereo delays use 'count' number of delaytimes, but for both channels
 				}
 				patch[i].Units[u].DelayTimes = append(patch[i].Units[u].DelayTimes, delayTimes[s:e]...)
@@ -188,35 +183,35 @@ func DeserializeAsm(asmcode string) (*Song, error) {
 
 func SerializeAsm(song *Song) (string, error) {
 	paramorder := map[string][]string{
-		"add":        []string{},
-		"addp":       []string{},
-		"pop":        []string{},
-		"loadnote":   []string{},
-		"mul":        []string{},
-		"mulp":       []string{},
-		"push":       []string{},
-		"xch":        []string{},
-		"distort":    []string{"drive"},
-		"hold":       []string{"holdfreq"},
-		"crush":      []string{"resolution"},
-		"gain":       []string{"gain"},
-		"invgain":    []string{"invgain"},
-		"filter":     []string{"frequency", "resonance", "lowpass", "bandpass", "highpass", "negbandpass", "neghighpass"},
-		"clip":       []string{},
-		"pan":        []string{"panning"},
-		"delay":      []string{"pregain", "dry", "feedback", "damp", "delay", "count", "notetracking"},
-		"compressor": []string{"attack", "release", "invgain", "threshold", "ratio"},
+		"add":        []string{"stereo"},
+		"addp":       []string{"stereo"},
+		"pop":        []string{"stereo"},
+		"loadnote":   []string{"stereo"},
+		"mul":        []string{"stereo"},
+		"mulp":       []string{"stereo"},
+		"push":       []string{"stereo"},
+		"xch":        []string{"stereo"},
+		"distort":    []string{"stereo", "drive"},
+		"hold":       []string{"stereo", "holdfreq"},
+		"crush":      []string{"stereo", "resolution"},
+		"gain":       []string{"stereo", "gain"},
+		"invgain":    []string{"stereo", "invgain"},
+		"filter":     []string{"stereo", "frequency", "resonance", "lowpass", "bandpass", "highpass", "negbandpass", "neghighpass"},
+		"clip":       []string{"stereo"},
+		"pan":        []string{"stereo", "panning"},
+		"delay":      []string{"stereo", "pregain", "dry", "feedback", "damp", "delay", "count", "notetracking"},
+		"compressor": []string{"stereo", "attack", "release", "invgain", "threshold", "ratio"},
 		"speed":      []string{},
-		"out":        []string{"gain"},
-		"outaux":     []string{"outgain", "auxgain"},
-		"aux":        []string{"gain", "channel"},
-		"send":       []string{"amount", "voice", "unit", "port", "sendpop"},
-		"envelope":   []string{"attack", "decay", "sustain", "release", "gain"},
-		"noise":      []string{"shape", "gain"},
-		"oscillator": []string{"transpose", "detune", "phase", "color", "shape", "gain", "type", "lfo", "unison"},
-		"loadval":    []string{"value"},
-		"receive":    []string{},
-		"in":         []string{"channel"},
+		"out":        []string{"stereo", "gain"},
+		"outaux":     []string{"stereo", "outgain", "auxgain"},
+		"aux":        []string{"stereo", "gain", "channel"},
+		"send":       []string{"stereo", "amount", "voice", "unit", "port", "sendpop"},
+		"envelope":   []string{"stereo", "attack", "decay", "sustain", "release", "gain"},
+		"noise":      []string{"stereo", "shape", "gain"},
+		"oscillator": []string{"stereo", "transpose", "detune", "phase", "color", "shape", "gain", "type", "lfo", "unison"},
+		"loadval":    []string{"stereo", "value"},
+		"receive":    []string{"stereo"},
+		"in":         []string{"stereo", "channel"},
 	}
 	indentation := 0
 	indent := func() string {
@@ -338,17 +333,13 @@ func SerializeAsm(song *Song) (string, error) {
 	for i, instrument := range song.Patch {
 		var instrTable [][]string
 		for j, unit := range instrument.Units {
-			stereomono := "MONO"
-			if unit.Stereo {
-				stereomono = "STEREO"
-			}
-			row := []string{fmt.Sprintf("SU_%v", strings.ToUpper(unit.Type)), stereomono}
+			row := []string{fmt.Sprintf("SU_%v", strings.ToUpper(unit.Type))}
 			for _, parname := range paramorder[unit.Type] {
 				if unit.Type == "oscillator" && unit.Parameters["type"] == Sample && parname == "color" {
 					row = append(row, fmt.Sprintf("COLOR(%v)", strconv.Itoa(sampleIndices[i][j])))
 				} else if unit.Type == "delay" && parname == "count" {
 					count := len(unit.DelayTimes)
-					if unit.Stereo {
+					if unit.Parameters["stereo"] == 1 {
 						count /= 2
 					}
 					row = append(row, fmt.Sprintf("COUNT(%v)", strconv.Itoa(count)))
diff --git a/go4k/bridge/bridge.go b/go4k/bridge/bridge.go
index e906460..b40362e 100644
--- a/go4k/bridge/bridge.go
+++ b/go4k/bridge/bridge.go
@@ -100,18 +100,18 @@ func Synth(patch go4k.Patch) (*C.Synth, error) {
 		for unitid, unit := range instr.Units {
 			if val, ok := opcodeTable[unit.Type]; ok {
 				opCode := val.opcode
-				if unit.Stereo {
+				if unit.Parameters["stereo"] == 1 {
 					opCode++
 				}
 				commands = append(commands, byte(opCode))
 				for _, paramname := range val.parameterList {
 					if unit.Type == "delay" && paramname == "delaycount" {
-						if unit.Stereo && len(unit.DelayTimes)%2 != 0 {
+						if unit.Parameters["stereo"] == 1 && len(unit.DelayTimes)%2 != 0 {
 							return nil, errors.New("Stereo delays should have even number of delaytimes")
 						}
 						values = append(values, byte(delayIndices[insid][unitid]))
 						count := len(unit.DelayTimes)
-						if unit.Stereo {
+						if unit.Parameters["stereo"] == 1 {
 							count /= 2
 						}
 						count = count*2 - 1
diff --git a/go4k/bridge/bridge_test.go b/go4k/bridge/bridge_test.go
index a2ae725..382681b 100644
--- a/go4k/bridge/bridge_test.go
+++ b/go4k/bridge/bridge_test.go
@@ -24,9 +24,9 @@ const su_max_samples = SAMPLES_PER_ROW * TOTAL_ROWS
 func TestBridge(t *testing.T) {
 	patch := []go4k.Instrument{
 		go4k.Instrument{1, []go4k.Unit{
-			go4k.Unit{"envelope", false, map[string]int{"attack": 64, "decay": 64, "sustain": 64, "release": 80, "gain": 128}, []int{}},
-			go4k.Unit{"envelope", false, map[string]int{"attack": 95, "decay": 64, "sustain": 64, "release": 80, "gain": 128}, []int{}},
-			go4k.Unit{"out", true, map[string]int{"gain": 128}, []int{}},
+			go4k.Unit{"envelope", map[string]int{"stereo": 0, "attack": 64, "decay": 64, "sustain": 64, "release": 80, "gain": 128}, []int{}},
+			go4k.Unit{"envelope", map[string]int{"stereo": 0, "attack": 95, "decay": 64, "sustain": 64, "release": 80, "gain": 128}, []int{}},
+			go4k.Unit{"out", map[string]int{"stereo": 1, "gain": 128}, []int{}},
 		}}}
 	synth, err := bridge.Synth(patch)
 	if err != nil {
diff --git a/go4k/go4k.go b/go4k/go4k.go
index b89805d..3f0f93a 100644
--- a/go4k/go4k.go
+++ b/go4k/go4k.go
@@ -8,7 +8,6 @@ import (
 // Unit is e.g. a filter, oscillator, envelope and its parameters
 type Unit struct {
 	Type       string
-	Stereo     bool
 	Parameters map[string]int
 	DelayTimes []int
 }
@@ -88,70 +87,66 @@ type UnitParameter struct {
 
 // UnitType documents the supported behaviour of one type of unit (oscillator, envelope etc.)
 type UnitType struct {
-	Name           string
-	SupportsStereo bool
-	Parameters     []UnitParameter
+	Name       string
+	Parameters []UnitParameter
 }
 
 // UnitTypes documents all the available unit types and if they support stereo variant
 // and what parameters they take.
 var UnitTypes = []UnitType{
 	{
-		Name:           "add",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "add",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "addp",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "addp",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "pop",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "pop",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "loadnote",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "loadnote",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "mul",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "mul",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "mulp",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "mulp",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "push",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "push",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "xch",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "xch",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "distort",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "drive", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "hold",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "holdfreq", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "crush",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "resolution", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "gain",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "invgain",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "invgain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "filter",
-		SupportsStereo: true,
+		Name: "distort",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "drive", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "hold",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "holdfreq", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "crush",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "resolution", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "gain",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "invgain",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "invgain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "filter",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "frequency", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "resonance", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "lowpass", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
@@ -160,17 +155,17 @@ var UnitTypes = []UnitType{
 			{Name: "negbandpass", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "neghighpass", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "clip",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{}},
+		Name:       "clip",
+		Parameters: []UnitParameter{{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false}}},
 	{
-		Name:           "pan",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "panning", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "delay",
-		SupportsStereo: true,
+		Name: "pan",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "panning", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "delay",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "pregain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "dry", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "feedback", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
@@ -179,9 +174,9 @@ var UnitTypes = []UnitType{
 			{Name: "delay", MinValue: 0, MaxValue: -1, CanSet: false, CanModulate: true},
 		}},
 	{
-		Name:           "compressor",
-		SupportsStereo: true,
+		Name: "compressor",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "attack", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "release", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "invgain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
@@ -189,31 +184,31 @@ var UnitTypes = []UnitType{
 			{Name: "ratio", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 		}},
 	{
-		Name:           "speed",
-		SupportsStereo: false,
-		Parameters:     []UnitParameter{}},
+		Name:       "speed",
+		Parameters: []UnitParameter{}},
 	{
-		Name:           "out",
-		SupportsStereo: true,
-		Parameters:     []UnitParameter{{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
-	{
-		Name:           "outaux",
-		SupportsStereo: true,
+		Name: "out",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
+			{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true}}},
+	{
+		Name: "outaux",
+		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "outgain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "auxgain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 		}},
 	{
-		Name:           "aux",
-		SupportsStereo: true,
+		Name: "aux",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "channel", MinValue: 0, MaxValue: 6, CanSet: true, CanModulate: false},
 		}},
 	{
-		Name:           "send",
-		SupportsStereo: true,
+		Name: "send",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "amount", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "voice", MinValue: 0, MaxValue: 32, CanSet: true, CanModulate: false},
 			{Name: "unit", MinValue: 0, MaxValue: 63, CanSet: true, CanModulate: false},
@@ -221,9 +216,9 @@ var UnitTypes = []UnitType{
 			{Name: "sendpop", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 		}},
 	{
-		Name:           "envelope",
-		SupportsStereo: true,
+		Name: "envelope",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "attack", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "decay", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "sustain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
@@ -231,16 +226,16 @@ var UnitTypes = []UnitType{
 			{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 		}},
 	{
-		Name:           "noise",
-		SupportsStereo: true,
+		Name: "noise",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "shape", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "gain", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 		}},
 	{
-		Name:           "oscillator",
-		SupportsStereo: true,
+		Name: "oscillator",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "transpose", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "detune", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 			{Name: "phase", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
@@ -255,22 +250,22 @@ var UnitTypes = []UnitType{
 			{Name: "looplength", MinValue: 0, MaxValue: 65535, CanSet: true, CanModulate: false}, // if type is "sample", then the loop length is this i.e. loop ends at "start" + "loopstart" + "looplength"
 		}},
 	{
-		Name:           "loadval",
-		SupportsStereo: true,
+		Name: "loadval",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "value", MinValue: 0, MaxValue: 128, CanSet: true, CanModulate: true},
 		}},
 	{
-		Name:           "receive",
-		SupportsStereo: true,
+		Name: "receive",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "left", MinValue: 0, MaxValue: -1, CanSet: false, CanModulate: true},
 			{Name: "right", MinValue: 0, MaxValue: -1, CanSet: false, CanModulate: true},
 		}},
 	{
-		Name:           "in",
-		SupportsStereo: true,
+		Name: "in",
 		Parameters: []UnitParameter{
+			{Name: "stereo", MinValue: 0, MaxValue: 1, CanSet: true, CanModulate: false},
 			{Name: "channel", MinValue: 0, MaxValue: 6, CanSet: true, CanModulate: false},
 		}},
 }
diff --git a/go4k/song_json_test.go b/go4k/song_json_test.go
index 3c7b7ee..7b7c140 100644
--- a/go4k/song_json_test.go
+++ b/go4k/song_json_test.go
@@ -8,7 +8,7 @@ import (
 	"github.com/vsariola/sointu/go4k"
 )
 
-const expectedMarshaled = "{\"BPM\":100,\"Patterns\":[\"QABEACAAAABLAE4AAAAAAA==\"],\"Tracks\":[{\"NumVoices\":1,\"Sequence\":\"AA==\"}],\"SongLength\":0,\"Patch\":[{\"NumVoices\":1,\"Units\":[{\"Type\":\"envelope\",\"Stereo\":false,\"Parameters\":{\"attack\":32,\"decay\":32,\"gain\":128,\"release\":64,\"sustain\":64},\"DelayTimes\":[]},{\"Type\":\"oscillator\",\"Stereo\":false,\"Parameters\":{\"color\":96,\"detune\":64,\"flags\":64,\"gain\":128,\"phase\":0,\"shape\":64,\"transpose\":64},\"DelayTimes\":[]},{\"Type\":\"mulp\",\"Stereo\":false,\"Parameters\":{},\"DelayTimes\":[]},{\"Type\":\"envelope\",\"Stereo\":false,\"Parameters\":{\"attack\":32,\"decay\":32,\"gain\":128,\"release\":64,\"sustain\":64},\"DelayTimes\":[]},{\"Type\":\"oscillator\",\"Stereo\":false,\"Parameters\":{\"color\":64,\"detune\":64,\"flags\":64,\"gain\":128,\"phase\":64,\"shape\":96,\"transpose\":72},\"DelayTimes\":[]},{\"Type\":\"mulp\",\"Stereo\":false,\"Parameters\":{},\"DelayTimes\":[]},{\"Type\":\"out\",\"Stereo\":true,\"Parameters\":{\"gain\":128},\"DelayTimes\":[]}]}]}"
+const expectedMarshaled = `{"BPM":100,"Patterns":["QABEACAAAABLAE4AAAAAAA=="],"Tracks":[{"NumVoices":1,"Sequence":"AA=="}],"SongLength":0,"Patch":[{"NumVoices":1,"Units":[{"Type":"envelope","Parameters":{"attack":32,"decay":32,"gain":128,"release":64,"stereo":0,"sustain":64},"DelayTimes":[]},{"Type":"oscillator","Parameters":{"color":96,"detune":64,"flags":64,"gain":128,"phase":0,"shape":64,"stereo":0,"transpose":64},"DelayTimes":[]},{"Type":"mulp","Parameters":{"stereo":0},"DelayTimes":[]},{"Type":"envelope","Parameters":{"attack":32,"decay":32,"gain":128,"release":64,"stereo":0,"sustain":64},"DelayTimes":[]},{"Type":"oscillator","Parameters":{"color":64,"detune":64,"flags":64,"gain":128,"phase":64,"shape":96,"stereo":0,"transpose":72},"DelayTimes":[]},{"Type":"mulp","Parameters":{"stereo":0},"DelayTimes":[]},{"Type":"out","Parameters":{"gain":128,"stereo":1},"DelayTimes":[]}]}]}`
 
 var testSong = go4k.Song{
 	BPM:      100,
@@ -19,13 +19,13 @@ var testSong = go4k.Song{
 	SongLength: 0,
 	Patch: go4k.Patch{
 		go4k.Instrument{NumVoices: 1, Units: []go4k.Unit{
-			{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-			{"oscillator", false, map[string]int{"transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "flags": 0x40}, []int{}},
-			{"mulp", false, map[string]int{}, []int{}},
-			{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-			{"oscillator", false, map[string]int{"transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "flags": 0x40}, []int{}},
-			{"mulp", false, map[string]int{}, []int{}},
-			{"out", true, map[string]int{"gain": 128}, []int{}},
+			{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+			{"oscillator", map[string]int{"stereo": 0, "transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "flags": 0x40}, []int{}},
+			{"mulp", map[string]int{"stereo": 0}, []int{}},
+			{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+			{"oscillator", map[string]int{"stereo": 0, "transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "flags": 0x40}, []int{}},
+			{"mulp", map[string]int{"stereo": 0}, []int{}},
+			{"out", map[string]int{"stereo": 1, "gain": 128}, []int{}},
 		}},
 	},
 }
diff --git a/go4k/song_test.go b/go4k/song_test.go
index d174b7a..3e985d9 100644
--- a/go4k/song_test.go
+++ b/go4k/song_test.go
@@ -24,13 +24,13 @@ const su_max_samples = SAMPLES_PER_ROW * TOTAL_ROWS
 
 func TestPlayer(t *testing.T) {
 	patch := []go4k.Instrument{go4k.Instrument{1, []go4k.Unit{
-		go4k.Unit{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-		go4k.Unit{"oscillator", false, map[string]int{"transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "type": go4k.Sine, "lfo": 0, "unison": 0}, []int{}},
-		go4k.Unit{"mulp", false, map[string]int{}, []int{}},
-		go4k.Unit{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-		go4k.Unit{"oscillator", false, map[string]int{"transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "type": go4k.Sine, "lfo": 0, "unison": 0}, []int{}},
-		go4k.Unit{"mulp", false, map[string]int{}, []int{}},
-		go4k.Unit{"out", true, map[string]int{"gain": 128}, []int{}},
+		go4k.Unit{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+		go4k.Unit{"oscillator", map[string]int{"stereo": 0, "transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "type": go4k.Sine, "lfo": 0, "unison": 0}, []int{}},
+		go4k.Unit{"mulp", map[string]int{"stereo": 0}, []int{}},
+		go4k.Unit{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+		go4k.Unit{"oscillator", map[string]int{"stereo": 0, "transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "type": go4k.Sine, "lfo": 0, "unison": 0}, []int{}},
+		go4k.Unit{"mulp", map[string]int{"stereo": 0}, []int{}},
+		go4k.Unit{"out", map[string]int{"stereo": 1, "gain": 128}, []int{}},
 	}}}
 	patterns := [][]byte{{64, 0, 68, 0, 32, 0, 0, 0, 75, 0, 78, 0, 0, 0, 0, 0}}
 	tracks := []go4k.Track{go4k.Track{1, []byte{0}}}
diff --git a/go4k/tracker/defaultsong.go b/go4k/tracker/defaultsong.go
index 0622be4..ec61465 100644
--- a/go4k/tracker/defaultsong.go
+++ b/go4k/tracker/defaultsong.go
@@ -15,13 +15,13 @@ var defaultSong = go4k.Song{
 	SongLength: 0,
 	Patch: go4k.Patch{
 		go4k.Instrument{NumVoices: 2, Units: []go4k.Unit{
-			{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-			{"oscillator", false, map[string]int{"transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "type": go4k.Sine}, []int{}},
-			{"mulp", false, map[string]int{}, []int{}},
-			{"envelope", false, map[string]int{"attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
-			{"oscillator", false, map[string]int{"transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "type": go4k.Sine}, []int{}},
-			{"mulp", false, map[string]int{}, []int{}},
-			{"out", true, map[string]int{"gain": 128}, []int{}},
+			{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+			{"oscillator", map[string]int{"stereo": 0, "transpose": 64, "detune": 64, "phase": 0, "color": 96, "shape": 64, "gain": 128, "type": go4k.Sine}, []int{}},
+			{"mulp", map[string]int{"stereo": 0}, []int{}},
+			{"envelope", map[string]int{"stereo": 0, "attack": 32, "decay": 32, "sustain": 64, "release": 64, "gain": 128}, []int{}},
+			{"oscillator", map[string]int{"stereo": 0, "transpose": 72, "detune": 64, "phase": 64, "color": 64, "shape": 96, "gain": 128, "type": go4k.Sine}, []int{}},
+			{"mulp", map[string]int{"stereo": 0}, []int{}},
+			{"out", map[string]int{"stereo": 1, "gain": 128}, []int{}},
 		}},
 	},
 }
diff --git a/include/sointu/arithmetic_header.inc b/include/sointu/arithmetic_header.inc
index 5ca1ee9..a10e021 100644
--- a/include/sointu/arithmetic_header.inc
+++ b/include/sointu/arithmetic_header.inc
@@ -14,7 +14,7 @@
 %macro SU_ADDP 1
     USE_ADDP
     %xdefine CMDS CMDS ADDP_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_ADDP
     %endif
 %endmacro
@@ -36,7 +36,7 @@
 %macro SU_ADD 1
     USE_ADD
     %xdefine CMDS CMDS ADD_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_ADD
     %endif
 %endmacro
@@ -57,7 +57,7 @@
 %macro SU_POP 1
     USE_POP
     %xdefine CMDS CMDS POP_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_POP
     %endif
 %endmacro
@@ -78,7 +78,7 @@
 %macro SU_LOADNOTE 1
     USE_LOADNOTE
     %xdefine CMDS CMDS LOADNOTE_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_LOADNOTE
     %endif
 %endmacro
@@ -99,7 +99,7 @@
 %macro SU_MUL 1
     USE_MUL
     %xdefine CMDS CMDS MUL_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_MUL
     %endif
 %endmacro
@@ -120,7 +120,7 @@
 %macro SU_MULP 1
     USE_MULP
     %xdefine CMDS CMDS MULP_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_MULP
     %endif
 %endmacro
@@ -141,7 +141,7 @@
 %macro SU_PUSH 1
     USE_PUSH
     %xdefine CMDS CMDS PUSH_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_PUSH
     %endif
 %endmacro
@@ -162,7 +162,7 @@
 %macro SU_XCH 1
     USE_XCH
     %xdefine CMDS CMDS XCH_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_XCH
     %endif
 %endmacro
diff --git a/include/sointu/effects_header.inc b/include/sointu/effects_header.inc
index 798d352..30d5b98 100644
--- a/include/sointu/effects_header.inc
+++ b/include/sointu/effects_header.inc
@@ -24,7 +24,7 @@
     db  (%4*LOWPASSFLAG)+(%5*BANDPASSFLAG)+(%6*HIGHPASSFLAG)+(%7*NEGBANDPASSFLAG)+(%8*NEGHIGHPASSFLAG)
     USE_FILTER
     %xdefine CMDS CMDS FILTER_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_FILTER
     %endif
     %if %4 > 0
@@ -82,7 +82,7 @@ endstruc
     db  %2
     USE_PAN
     %xdefine CMDS CMDS PAN_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_PAN
     %endif
 %endmacro
@@ -111,7 +111,7 @@ endstruc
     db  %2
     USE_DISTORT
     %xdefine CMDS CMDS DISTORT_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_DISTORT
     %endif
 %endmacro
@@ -140,7 +140,7 @@ endstruc
     db  %2
     USE_HOLD
     %xdefine CMDS CMDS HOLD_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_HOLD
     %endif
 %endmacro
@@ -174,7 +174,7 @@ endstruc
     db  %2
     USE_CRUSH
     %xdefine CMDS CMDS CRUSH_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_CRUSH
     %endif
 %endmacro
@@ -203,7 +203,7 @@ endstruc
     db  %2
     USE_GAIN
     %xdefine CMDS CMDS GAIN_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_GAIN
     %endif
 %endmacro
@@ -232,7 +232,7 @@ endstruc
     db  %2
     USE_INVGAIN
     %xdefine CMDS CMDS INVGAIN_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_INVGAIN
     %endif
 %endmacro
@@ -260,7 +260,7 @@ endstruc
 %macro SU_CLIP 1
     USE_CLIP
     %xdefine CMDS CMDS CLIP_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_CLIP
     %endif
 %endmacro
@@ -291,7 +291,7 @@ endstruc
     USE_DELAY
     %xdefine CMDS CMDS DELAY_ID + %1,
     %assign NUM_DELAY_LINES NUM_DELAY_LINES + %7 * (1+%1)
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_DELAY
     %endif
     %if %8 > 0
@@ -364,7 +364,7 @@ endstruc
     db  %6
     USE_COMPRES
     %xdefine CMDS CMDS COMPRES_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_COMPRES
     %endif
 %endmacro
diff --git a/include/sointu/flowcontrol_header.inc b/include/sointu/flowcontrol_header.inc
index f5c4224..db0cdaf 100644
--- a/include/sointu/flowcontrol_header.inc
+++ b/include/sointu/flowcontrol_header.inc
@@ -11,9 +11,9 @@
     %endif
 %endmacro
 
-%macro SU_SPEED 1
+%macro SU_SPEED 0
     USE_SPEED
-    %xdefine CMDS CMDS SPEED_ID+%1, ; for future, although currently there is no stereo variant implemented
+    %xdefine CMDS CMDS SPEED_ID,
 %endmacro
 
 struc su_speed_wrk
diff --git a/include/sointu/header.inc b/include/sointu/header.inc
index e0963bb..8fd8f4f 100644
--- a/include/sointu/header.inc
+++ b/include/sointu/header.inc
@@ -83,8 +83,7 @@
 %define OPCODES         MANGLE_FUNC(su_op_advance,0),
 %define NUMPARAMS       0,
 %define SU_ADVANCE_ID   0
-%define MONO            0
-%define STEREO          1
+%define STEREO(val)     val
 
 section .text ; yasm throws section redeclaration warnings if strucs are defined without a plain .text section
 
diff --git a/include/sointu/sinks_header.inc b/include/sointu/sinks_header.inc
index aea0820..7bb5d34 100644
--- a/include/sointu/sinks_header.inc
+++ b/include/sointu/sinks_header.inc
@@ -15,7 +15,7 @@
     db  %2
     USE_OUT
     %xdefine CMDS CMDS OUT_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_OUT
     %endif
 %endmacro
@@ -44,7 +44,7 @@ endstruc
     db  %3
     USE_OUTAUX
     %xdefine CMDS CMDS OUTAUX_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_OUTAUX
     %endif
 %endmacro
@@ -75,7 +75,7 @@ endstruc
     db  %3
     USE_AUX
     %xdefine CMDS CMDS AUX_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_AUX
     %endif
 %endmacro
@@ -109,7 +109,7 @@ endstruc
     %endif
     USE_SEND
     %xdefine CMDS CMDS SEND_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_SEND
     %endif    
 %endmacro
diff --git a/include/sointu/sources_header.inc b/include/sointu/sources_header.inc
index a22689c..a17010b 100644
--- a/include/sointu/sources_header.inc
+++ b/include/sointu/sources_header.inc
@@ -19,7 +19,7 @@
     db  %6
     USE_ENVELOPE
     %xdefine CMDS CMDS ENVELOPE_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_ENVELOPE
     %endif
 %endmacro
@@ -80,7 +80,7 @@ endstruc
     db  %8 + (LFOFLAG * %9) + %10 ; TYPE + LFO + UNISON
     USE_OSCILLAT
     %xdefine CMDS CMDS OSCILLAT_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_OSCILLAT
     %endif
     %if (%8) & SINE == SINE
@@ -173,7 +173,7 @@ endstruc
     db  %3
     USE_NOISE
     %xdefine CMDS CMDS NOISE_ID + %1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_NOISE
     %endif
 %endmacro
@@ -200,7 +200,7 @@ endstruc
     db  %2
     USE_LOAD_VAL
     %xdefine CMDS CMDS LOADVAL_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_LOADVAL
     %endif
 %endmacro
@@ -227,7 +227,7 @@ endstruc
 %macro  SU_RECEIVE 1
     USE_RECEIVE
     %xdefine CMDS CMDS RECEIVE_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_RECEIVE
     %endif
 %endmacro
@@ -254,7 +254,7 @@ endstruc
     db %2
     USE_IN
     %xdefine CMDS CMDS IN_ID+%1,
-    %if %1 == STEREO
+    %if %1 == 1
         %define INCLUDE_STEREO_IN
     %endif
 %endmacro
diff --git a/tests/test_add.asm b/tests/test_add.asm
index fb0be59..4ae08c9 100644
--- a/tests/test_add.asm
+++ b/tests/test_add.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_ADD     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_ADD     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_add_stereo.asm b/tests/test_add_stereo.asm
index 9f9b5e3..0ddb0ac 100644
--- a/tests/test_add_stereo.asm
+++ b/tests/test_add_stereo.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_ADD     STEREO
-        SU_XCH     STEREO
-        SU_POP     MONO
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_ADD     STEREO(1)
+        SU_XCH     STEREO(1)
+        SU_POP     STEREO(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_addp.asm b/tests/test_addp.asm
index 3996db3..3fa541f 100644
--- a/tests/test_addp.asm
+++ b/tests/test_addp.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(48)
-        SU_LOADVAL MONO,VALUE(48)
-        SU_ADDP    MONO
-        SU_LOADVAL MONO,VALUE(80)
-        SU_LOADVAL MONO,VALUE(80)
-        SU_ADDP    MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(48)
+        SU_LOADVAL STEREO(0),VALUE(48)
+        SU_ADDP    STEREO(0)
+        SU_LOADVAL STEREO(0),VALUE(80)
+        SU_LOADVAL STEREO(0),VALUE(80)
+        SU_ADDP    STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_addp_stereo.asm b/tests/test_addp_stereo.asm
index 1048a3a..7a0fcc0 100644
--- a/tests/test_addp_stereo.asm
+++ b/tests/test_addp_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_aux.asm b/tests/test_aux.asm
index d5203b4..30431f9 100644
--- a/tests/test_aux.asm
+++ b/tests/test_aux.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_AUX     MONO,GAIN(64),CHANNEL(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_AUX     MONO,GAIN(128),CHANNEL(0)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_AUX     STEREO(0),GAIN(64),CHANNEL(1)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_AUX     STEREO(0),GAIN(128),CHANNEL(0)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_aux_stereo.asm b/tests/test_aux_stereo.asm
index 8f73414..4b8edcb 100644
--- a/tests/test_aux_stereo.asm
+++ b/tests/test_aux_stereo.asm
@@ -12,16 +12,16 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_AUX     STEREO,GAIN(128),CHANNEL(0)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_AUX     STEREO,GAIN(64),CHANNEL(2)
-        SU_IN      STEREO,CHANNEL(0)
-        SU_IN      STEREO,CHANNEL(2)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_AUX     STEREO(1),GAIN(128),CHANNEL(0)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_AUX     STEREO(1),GAIN(64),CHANNEL(2)
+        SU_IN      STEREO(1),CHANNEL(0)
+        SU_IN      STEREO(1),CHANNEL(2)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_chords.asm b/tests/test_chords.asm
index f614acf..16be451 100644
--- a/tests/test_chords.asm
+++ b/tests/test_chords.asm
@@ -16,12 +16,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(3)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(32)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_clip.asm b/tests/test_clip.asm
index 9792825..f645051 100644
--- a/tests/test_clip.asm
+++ b/tests/test_clip.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_INVGAIN    STEREO,INVGAIN(64)
-        SU_CLIP       MONO
-        SU_GAIN       STEREO,GAIN(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_INVGAIN    STEREO(1),INVGAIN(64)
+        SU_CLIP       STEREO(0)
+        SU_GAIN       STEREO(1),GAIN(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_clip_stereo.asm b/tests/test_clip_stereo.asm
index 8c1eb6d..5e11278 100644
--- a/tests/test_clip_stereo.asm
+++ b/tests/test_clip_stereo.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_INVGAIN    STEREO,INVGAIN(64)
-        SU_CLIP       STEREO
-        SU_GAIN       STEREO,GAIN(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_INVGAIN    STEREO(1),INVGAIN(64)
+        SU_CLIP       STEREO(1)
+        SU_GAIN       STEREO(1),GAIN(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_compressor.asm b/tests/test_compressor.asm
index 0514584..d13a8eb 100644
--- a/tests/test_compressor.asm
+++ b/tests/test_compressor.asm
@@ -14,28 +14,28 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_RECEIVE    STEREO
-        SU_COMPRESSOR MONO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96)
-        SU_MULP       MONO
-        SU_OUT        STEREO,GAIN(128)
+        SU_RECEIVE    STEREO(1)
+        SU_COMPRESSOR STEREO(0),ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96)
+        SU_MULP       STEREO(0)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_compressor_stereo.asm b/tests/test_compressor_stereo.asm
index cfd22fd..d857072 100644
--- a/tests/test_compressor_stereo.asm
+++ b/tests/test_compressor_stereo.asm
@@ -14,28 +14,28 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(16)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
-        SU_SEND       MONO,AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(88),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(0),SENDPOP(1)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(3),UNIT(0),PORT(1),SENDPOP(1)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_RECEIVE    STEREO
-        SU_COMPRESSOR STEREO,ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_RECEIVE    STEREO(1)
+        SU_COMPRESSOR STEREO(1),ATTACK(32),RELEASE(64),INVGAIN(32),THRESHOLD(64),RATIO(96)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_crush.asm b/tests/test_crush.asm
index 21232d4..6c8418b 100644
--- a/tests/test_crush.asm
+++ b/tests/test_crush.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_CRUSH      MONO,RESOLUTION(3)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_CRUSH      MONO,RESOLUTION(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_CRUSH      STEREO(0),RESOLUTION(3)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_CRUSH      STEREO(0),RESOLUTION(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_crush_stereo.asm b/tests/test_crush_stereo.asm
index 938f06f..1ab2d45 100644
--- a/tests/test_crush_stereo.asm
+++ b/tests/test_crush_stereo.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_CRUSH      STEREO,RESOLUTION(32)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(128),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_CRUSH      STEREO(1),RESOLUTION(32)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay.asm b/tests/test_delay.asm
index 7db8447..cc4b7a0 100644
--- a/tests/test_delay.asm
+++ b/tests/test_delay.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_dampmod.asm b/tests/test_delay_dampmod.asm
index 07fed06..c478c6b 100644
--- a/tests/test_delay_dampmod.asm
+++ b/tests/test_delay_dampmod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(3),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(3),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_drymod.asm b/tests/test_delay_drymod.asm
index 01ef152..3ef9127 100644
--- a/tests/test_delay_drymod.asm
+++ b/tests/test_delay_drymod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_feedbackmod.asm b/tests/test_delay_feedbackmod.asm
index d3671d7..b6adcc5 100644
--- a/tests/test_delay_feedbackmod.asm
+++ b/tests/test_delay_feedbackmod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(2),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(2),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_flanger.asm b/tests/test_delay_flanger.asm
index eea4b3f..e722640 100644
--- a/tests/test_delay_flanger.asm
+++ b/tests/test_delay_flanger.asm
@@ -13,14 +13,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(65),VOICE(0),UNIT(3),PORT(5),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(0),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(50),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(65),VOICE(0),UNIT(3),PORT(5),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_notetracking.asm b/tests/test_delay_notetracking.asm
index d13961b..b827fcb 100644
--- a/tests/test_delay_notetracking.asm
+++ b/tests/test_delay_notetracking.asm
@@ -12,16 +12,16 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(0),DECAY(0),SUSTAIN(96),RELEASE(96),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(0),DECAY(48),SUSTAIN(0),RELEASE(0),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_DELAY      MONO,PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1),NOTETRACKING(1)
-        SU_FILTER     MONO,FREQUENCY(24),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_MULP       MONO
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(0),DECAY(0),SUSTAIN(96),RELEASE(96),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(0),DECAY(48),SUSTAIN(0),RELEASE(0),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(64),SHAPE(127),GAIN(64),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_DELAY      STEREO(0),PREGAIN(128),DRY(128),FEEDBACK(128),DAMP(16),DELAY(0),COUNT(1),NOTETRACKING(1)
+        SU_FILTER     STEREO(0),FREQUENCY(24),RESONANCE(128),LOWPASS(1),BANDPASS(1),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_MULP       STEREO(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_pregainmod.asm b/tests/test_delay_pregainmod.asm
index b6167d4..f5dfba3 100644
--- a/tests/test_delay_pregainmod.asm
+++ b/tests/test_delay_pregainmod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_reverb.asm b/tests/test_delay_reverb.asm
index f577914..46e7896 100644
--- a/tests/test_delay_reverb.asm
+++ b/tests/test_delay_reverb.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_DELAY      MONO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),NOTETRACKING(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_DELAY      STEREO(0),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(8),NOTETRACKING(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_delay_stereo.asm b/tests/test_delay_stereo.asm
index d6079bc..d061890 100644
--- a/tests/test_delay_stereo.asm
+++ b/tests/test_delay_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PAN        MONO,PANNING(64)
-        SU_DELAY      STEREO,PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_DELAY      STEREO(1),PREGAIN(40),DRY(128),FEEDBACK(125),DAMP(64),DELAY(0),COUNT(1),NOTETRACKING(0)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_distort.asm b/tests/test_distort.asm
index 9340aa2..55f4227 100644
--- a/tests/test_distort.asm
+++ b/tests/test_distort.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_DISTORT  MONO,DRIVE(32)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_DISTORT  MONO,DRIVE(96)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_DISTORT  STEREO(0),DRIVE(32)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_DISTORT  STEREO(0),DRIVE(96)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_distort_mod.asm b/tests/test_distort_mod.asm
index bce221d..0463df4 100644
--- a/tests/test_distort_mod.asm
+++ b/tests/test_distort_mod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_DISTORT    MONO,DRIVE(32)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_DISTORT    MONO,DRIVE(96)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_DISTORT    STEREO(0),DRIVE(32)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_DISTORT    STEREO(0),DRIVE(96)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_distort_stereo.asm b/tests/test_distort_stereo.asm
index c9d7fc3..2c7fd87 100644
--- a/tests/test_distort_stereo.asm
+++ b/tests/test_distort_stereo.asm
@@ -12,9 +12,9 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE STEREO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_DISTORT  STEREO,DRIVE(96)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(1),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_DISTORT  STEREO(1),DRIVE(96)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_envelope.asm b/tests/test_envelope.asm
index e3d78a6..18ee1ca 100644
--- a/tests/test_envelope.asm
+++ b/tests/test_envelope.asm
@@ -12,9 +12,9 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(95),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(95),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_envelope_mod.asm b/tests/test_envelope_mod.asm
index 20ca4e8..39b1a99 100644
--- a/tests/test_envelope_mod.asm
+++ b/tests/test_envelope_mod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(0),SENDPOP(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(1),SENDPOP(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(0),PORT(3),SENDPOP(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(110)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(120),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(0),SENDPOP(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(1),SENDPOP(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(0),PORT(3),SENDPOP(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(110)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_envelope_stereo.asm b/tests/test_envelope_stereo.asm
index e474109..126485b 100644
--- a/tests/test_envelope_stereo.asm
+++ b/tests/test_envelope_stereo.asm
@@ -12,8 +12,8 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE STEREO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(1),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_band.asm b/tests/test_filter_band.asm
index f683215..3d24467 100644
--- a/tests/test_filter_band.asm
+++ b/tests/test_filter_band.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_freqmod.asm b/tests/test_filter_freqmod.asm
index f6f54dd..9d66f93 100644
--- a/tests/test_filter_freqmod.asm
+++ b/tests/test_filter_freqmod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_high.asm b/tests/test_filter_high.asm
index 8d7767c..35b94ee 100644
--- a/tests/test_filter_high.asm
+++ b/tests/test_filter_high.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(0),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(0),HIGHPASS(1),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_low.asm b/tests/test_filter_low.asm
index 91496b2..edc2717 100644
--- a/tests/test_filter_low.asm
+++ b/tests/test_filter_low.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_peak.asm b/tests/test_filter_peak.asm
index 472062c..a093176 100644
--- a/tests/test_filter_peak.asm
+++ b/tests/test_filter_peak.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(1)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(1),BANDPASS(0),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(1)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_resmod.asm b/tests/test_filter_resmod.asm
index 8ea741e..0db6882 100644
--- a/tests/test_filter_resmod.asm
+++ b/tests/test_filter_resmod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_FILTER     MONO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_PAN        MONO,PANNING(64)
-        SU_OUT        STEREO,GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_FILTER     STEREO(0),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_OUT        STEREO(1),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(32),VOICE(0),UNIT(3),PORT(1),SENDPOP(1)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_filter_stereo.asm b/tests/test_filter_stereo.asm
index 2fde777..e01b90c 100644
--- a/tests/test_filter_stereo.asm
+++ b/tests/test_filter_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PAN        MONO,PANNING(64)
-        SU_FILTER     STEREO,FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(72),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PAN        STEREO(0),PANNING(64)
+        SU_FILTER     STEREO(1),FREQUENCY(32),RESONANCE(64),LOWPASS(0),BANDPASS(1),HIGHPASS(0),NEGBANDPASS(0),NEGHIGHPASS(0)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_gain.asm b/tests/test_gain.asm
index 7642b5f..afd4089 100644
--- a/tests/test_gain.asm
+++ b/tests/test_gain.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_GAIN    STEREO,GAIN(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_GAIN    STEREO(1),GAIN(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_gain_stereo.asm b/tests/test_gain_stereo.asm
index c3cd267..5e24529 100644
--- a/tests/test_gain_stereo.asm
+++ b/tests/test_gain_stereo.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_GAIN    MONO,GAIN(128)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_GAIN    MONO,GAIN(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_GAIN    STEREO(0),GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_GAIN    STEREO(0),GAIN(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_hold.asm b/tests/test_hold.asm
index c63809b..b33b1b9 100644
--- a/tests/test_hold.asm
+++ b/tests/test_hold.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_HOLD     MONO,HOLDFREQ(3)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_HOLD     MONO,HOLDFREQ(3)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_HOLD     STEREO(0),HOLDFREQ(3)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_HOLD     STEREO(0),HOLDFREQ(3)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_hold_mod.asm b/tests/test_hold_mod.asm
index 0e62331..76210ef 100644
--- a/tests/test_hold_mod.asm
+++ b/tests/test_hold_mod.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_HOLD       MONO,HOLDFREQ(3)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_HOLD       MONO,HOLDFREQ(3)
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_HOLD       STEREO(0),HOLDFREQ(3)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_HOLD       STEREO(0),HOLDFREQ(3)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(3),PORT(0),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_hold_stereo.asm b/tests/test_hold_stereo.asm
index d115a87..2fc3bd5 100644
--- a/tests/test_hold_stereo.asm
+++ b/tests/test_hold_stereo.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_HOLD     STEREO,HOLDFREQ(3)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_HOLD     STEREO(1),HOLDFREQ(3)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_in.asm b/tests/test_in.asm
index aeb30dd..455dd02 100644
--- a/tests/test_in.asm
+++ b/tests/test_in.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_OUT     STEREO,GAIN(128)
-        SU_IN      MONO,CHANNEL(1)
-        SU_IN      MONO,CHANNEL(0)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_OUT     STEREO(1),GAIN(128)
+        SU_IN      STEREO(0),CHANNEL(1)
+        SU_IN      STEREO(0),CHANNEL(0)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_in_stereo.asm b/tests/test_in_stereo.asm
index 8223d79..7980c72 100644
--- a/tests/test_in_stereo.asm
+++ b/tests/test_in_stereo.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_OUT     STEREO,GAIN(128)
-        SU_IN      STEREO,CHANNEL(0)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_OUT     STEREO(1),GAIN(128)
+        SU_IN      STEREO(1),CHANNEL(0)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_invgain.asm b/tests/test_invgain.asm
index ccaf2ad..965a44c 100644
--- a/tests/test_invgain.asm
+++ b/tests/test_invgain.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(48)
-        SU_INVGAIN MONO,INVGAIN(64)
-        SU_LOADVAL MONO,VALUE(80)
-        SU_INVGAIN MONO,INVGAIN(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(48)
+        SU_INVGAIN STEREO(0),INVGAIN(64)
+        SU_LOADVAL STEREO(0),VALUE(80)
+        SU_INVGAIN STEREO(0),INVGAIN(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_invgain_stereo.asm b/tests/test_invgain_stereo.asm
index e5ddcb0..b47506d 100644
--- a/tests/test_invgain_stereo.asm
+++ b/tests/test_invgain_stereo.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(48)
-        SU_LOADVAL MONO,VALUE(80)
-        SU_INVGAIN STEREO,INVGAIN(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(48)
+        SU_LOADVAL STEREO(0),VALUE(80)
+        SU_INVGAIN STEREO(1),INVGAIN(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_loadnote.asm b/tests/test_loadnote.asm
index ac692b4..ae2b375 100644
--- a/tests/test_loadnote.asm
+++ b/tests/test_loadnote.asm
@@ -12,9 +12,9 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADNOTE MONO
-        SU_LOADNOTE MONO
-        SU_OUT      STEREO,GAIN(128)
+        SU_LOADNOTE STEREO(0)
+        SU_LOADNOTE STEREO(0)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_loadnote_stereo.asm b/tests/test_loadnote_stereo.asm
index f1583f6..50218e0 100644
--- a/tests/test_loadnote_stereo.asm
+++ b/tests/test_loadnote_stereo.asm
@@ -12,8 +12,8 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADNOTE STEREO
-        SU_OUT      STEREO,GAIN(128)
+        SU_LOADNOTE STEREO(1)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_loadval.asm b/tests/test_loadval.asm
index 702fb7e..937c5bc 100644
--- a/tests/test_loadval.asm
+++ b/tests/test_loadval.asm
@@ -12,9 +12,9 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(40)
-        SU_LOADVAL MONO,VALUE(80)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(40)
+        SU_LOADVAL STEREO(0),VALUE(80)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_loadval_stereo.asm b/tests/test_loadval_stereo.asm
index e26a8f0..7221ffc 100644
--- a/tests/test_loadval_stereo.asm
+++ b/tests/test_loadval_stereo.asm
@@ -12,8 +12,8 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL STEREO,VALUE(40)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(1),VALUE(40)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_mul.asm b/tests/test_mul.asm
index f6a00af..31c5532 100644
--- a/tests/test_mul.asm
+++ b/tests/test_mul.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_MUL     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_MUL     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_mul_stereo.asm b/tests/test_mul_stereo.asm
index 002a411..34e75bd 100644
--- a/tests/test_mul_stereo.asm
+++ b/tests/test_mul_stereo.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_MUL     STEREO
-        SU_XCH     STEREO
-        SU_POP     MONO
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_MUL     STEREO(1)
+        SU_XCH     STEREO(1)
+        SU_POP     STEREO(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_mulp.asm b/tests/test_mulp.asm
index 010f1ff..7592b20 100644
--- a/tests/test_mulp.asm
+++ b/tests/test_mulp.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_MULP    MONO
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_MULP    MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_MULP    STEREO(0)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_MULP    STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_mulp_stereo.asm b/tests/test_mulp_stereo.asm
index 70f04fb..e0fa257 100644
--- a/tests/test_mulp_stereo.asm
+++ b/tests/test_mulp_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_MULP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_MULP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_multiple_instruments.asm b/tests/test_multiple_instruments.asm
index 7b964c2..4d17018 100644
--- a/tests/test_multiple_instruments.asm
+++ b/tests/test_multiple_instruments.asm
@@ -14,14 +14,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(0)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(0)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(0)
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(0)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_noise.asm b/tests/test_noise.asm
index bc23e5a..46ea108 100644
--- a/tests/test_noise.asm
+++ b/tests/test_noise.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_NOISE    MONO,SHAPE(64),GAIN(128)
-        SU_MULP     MONO
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_NOISE    MONO,SHAPE(96),GAIN(128)
-        SU_MULP     MONO
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_NOISE    STEREO(0),SHAPE(64),GAIN(128)
+        SU_MULP     STEREO(0)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_NOISE    STEREO(0),SHAPE(96),GAIN(128)
+        SU_MULP     STEREO(0)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_noise_stereo.asm b/tests/test_noise_stereo.asm
index c98aac8..c5f78cb 100644
--- a/tests/test_noise_stereo.asm
+++ b/tests/test_noise_stereo.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_NOISE    STEREO,SHAPE(96),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_MULP     STEREO
-        SU_OUT      STEREO,GAIN(128)
+        SU_NOISE    STEREO(1),SHAPE(96),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_MULP     STEREO(1)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_colormod.asm b/tests/test_oscillat_colormod.asm
index d1d064e..7787086 100644
--- a/tests/test_oscillat_colormod.asm
+++ b/tests/test_oscillat_colormod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(3),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(3),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_detunemod.asm b/tests/test_oscillat_detunemod.asm
index fdc4d13..374fe92 100644
--- a/tests/test_oscillat_detunemod.asm
+++ b/tests/test_oscillat_detunemod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(96),VOICE(0),UNIT(1),PORT(1),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(96),VOICE(0),UNIT(1),PORT(1),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_gainmod.asm b/tests/test_oscillat_gainmod.asm
index 0ed4819..dc596ee 100644
--- a/tests/test_oscillat_gainmod.asm
+++ b/tests/test_oscillat_gainmod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(5),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(5),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_gate.asm b/tests/test_oscillat_gate.asm
index bb81a16..84d7d95 100644
--- a/tests/test_oscillat_gate.asm
+++ b/tests/test_oscillat_gate.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(GATE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),TYPE(GATE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(15),SHAPE(96),GAIN(128),TYPE(GATE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(170),SHAPE(64),GAIN(128),TYPE(GATE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_lfo.asm b/tests/test_oscillat_lfo.asm
index 3142325..97656fd 100644
--- a/tests/test_oscillat_lfo.asm
+++ b/tests/test_oscillat_lfo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(1),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(90),DETUNE(64),PHASE(0),COLOR(128),SHAPE(96),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(100),DETUNE(64),PHASE(0),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(1),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_phasemod.asm b/tests/test_oscillat_phasemod.asm
index 62daa10..88e9374 100644
--- a/tests/test_oscillat_phasemod.asm
+++ b/tests/test_oscillat_phasemod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(128),VOICE(0),UNIT(1),PORT(2),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(128),VOICE(0),UNIT(1),PORT(2),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_pulse.asm b/tests/test_oscillat_pulse.asm
index 971a06b..fbbf501 100644
--- a/tests/test_oscillat_pulse.asm
+++ b/tests/test_oscillat_pulse.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(PULSE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_sample.asm b/tests/test_oscillat_sample.asm
index 2a4e80c..a6d7426 100644
--- a/tests/test_oscillat_sample.asm
+++ b/tests/test_oscillat_sample.asm
@@ -17,20 +17,20 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(68),DETUNE(64),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(66),DETUNE(64),PHASE(64),COLOR(1),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_sample_stereo.asm b/tests/test_oscillat_sample_stereo.asm
index d3ce08e..1c7f736 100644
--- a/tests/test_oscillat_sample_stereo.asm
+++ b/tests/test_oscillat_sample_stereo.asm
@@ -17,18 +17,18 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR STEREO,TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(1),TRANSPOSE(68),DETUNE(32),PHASE(64),COLOR(0),SHAPE(64),GAIN(128),TYPE(SAMPLE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR STEREO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_shapemod.asm b/tests/test_oscillat_shapemod.asm
index 928abb5..dccacb8 100644
--- a/tests/test_oscillat_shapemod.asm
+++ b/tests/test_oscillat_shapemod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(4),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_sine.asm b/tests/test_oscillat_sine.asm
index 24242cc..a1855cb 100644
--- a/tests/test_oscillat_sine.asm
+++ b/tests/test_oscillat_sine.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_stereo.asm b/tests/test_oscillat_stereo.asm
index 6cfbbaf..def8019 100644
--- a/tests/test_oscillat_stereo.asm
+++ b/tests/test_oscillat_stereo.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR STEREO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_transposemod.asm b/tests/test_oscillat_transposemod.asm
index 7475315..6b0e220 100644
--- a/tests/test_oscillat_transposemod.asm
+++ b/tests/test_oscillat_transposemod.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OSCILLATOR MONO,TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
-        SU_SEND       MONO,AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(1)
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(80),DECAY(80),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(70),DETUNE(64),PHASE(64),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(1),UNISON(0)
+        SU_SEND       STEREO(0),AMOUNT(68),VOICE(0),UNIT(1),PORT(0),SENDPOP(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_trisaw.asm b/tests/test_oscillat_trisaw.asm
index 8ccc8e9..5b68087 100644
--- a/tests/test_oscillat_trisaw.asm
+++ b/tests/test_oscillat_trisaw.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_unison.asm b/tests/test_oscillat_unison.asm
index ca87902..506950f 100644
--- a/tests/test_oscillat_unison.asm
+++ b/tests/test_oscillat_unison.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3)
-        SU_MULP       MONO
-        SU_PUSH       MONO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3)
+        SU_MULP       STEREO(0)
+        SU_PUSH       STEREO(0)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_oscillat_unison_stereo.asm b/tests/test_oscillat_unison_stereo.asm
index 83ae174..e630a73 100644
--- a/tests/test_oscillat_unison_stereo.asm
+++ b/tests/test_oscillat_unison_stereo.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   STEREO,ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR STEREO,TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(1),ATTACK(32),DECAY(32),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(1),TRANSPOSE(64),DETUNE(0),PHASE(64),COLOR(128),SHAPE(64),GAIN(32),TYPE(TRISAW),LFO(0),UNISON(3)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_outaux.asm b/tests/test_outaux.asm
index 7725f76..b3dc87b 100644
--- a/tests/test_outaux.asm
+++ b/tests/test_outaux.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_OUTAUX  MONO,OUTGAIN(32),AUXGAIN(64)
-        SU_IN      MONO,CHANNEL(0)
-        SU_IN      MONO,CHANNEL(2)
-        SU_LOADVAL MONO,VALUE(48)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_OUTAUX  STEREO(0),OUTGAIN(32),AUXGAIN(64)
+        SU_IN      STEREO(0),CHANNEL(0)
+        SU_IN      STEREO(0),CHANNEL(2)
+        SU_LOADVAL STEREO(0),VALUE(48)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_outaux_stereo.asm b/tests/test_outaux_stereo.asm
index c78c965..1a841c3 100644
--- a/tests/test_outaux_stereo.asm
+++ b/tests/test_outaux_stereo.asm
@@ -12,15 +12,15 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_OUTAUX  STEREO,OUTGAIN(16),AUXGAIN(48)
-        SU_IN      MONO,CHANNEL(1)
-        SU_IN      MONO,CHANNEL(0)
-        SU_IN      MONO,CHANNEL(3)
-        SU_IN      MONO,CHANNEL(2)
-        SU_ADDP    STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_OUTAUX  STEREO(1),OUTGAIN(16),AUXGAIN(48)
+        SU_IN      STEREO(0),CHANNEL(1)
+        SU_IN      STEREO(0),CHANNEL(0)
+        SU_IN      STEREO(0),CHANNEL(3)
+        SU_IN      STEREO(0),CHANNEL(2)
+        SU_ADDP    STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_panning.asm b/tests/test_panning.asm
index f17bce1..d74a7b7 100644
--- a/tests/test_panning.asm
+++ b/tests/test_panning.asm
@@ -12,9 +12,9 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_PAN      MONO,PANNING(40)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_PAN      STEREO(0),PANNING(40)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_panning_stereo.asm b/tests/test_panning_stereo.asm
index f05d745..79d3dac 100644
--- a/tests/test_panning_stereo.asm
+++ b/tests/test_panning_stereo.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_ENVELOPE MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
-        SU_PAN      STEREO,PANNING(40)
-        SU_OUT      STEREO,GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_ENVELOPE STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(80),GAIN(128)
+        SU_PAN      STEREO(1),PANNING(40)
+        SU_OUT      STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_polyphony.asm b/tests/test_polyphony.asm
index feb40bf..b65ce78 100644
--- a/tests/test_polyphony.asm
+++ b/tests/test_polyphony.asm
@@ -12,20 +12,20 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(64),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(64),PHASE(0),COLOR(128),SHAPE(64),GAIN(128),TYPE(SINE),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_pop.asm b/tests/test_pop.asm
index ebf0889..837b177 100644
--- a/tests/test_pop.asm
+++ b/tests/test_pop.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_pop_stereo.asm b/tests/test_pop_stereo.asm
index dc89739..9743c01 100644
--- a/tests/test_pop_stereo.asm
+++ b/tests/test_pop_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_POP     STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_POP     STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_push.asm b/tests/test_push.asm
index cb7299a..b9949a1 100644
--- a/tests/test_push.asm
+++ b/tests/test_push.asm
@@ -12,11 +12,11 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_PUSH    MONO
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_PUSH    STEREO(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_push_stereo.asm b/tests/test_push_stereo.asm
index 962c213..dbaacaf 100644
--- a/tests/test_push_stereo.asm
+++ b/tests/test_push_stereo.asm
@@ -12,12 +12,12 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_PUSH    STEREO
-        SU_POP     MONO
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_PUSH    STEREO(1)
+        SU_POP     STEREO(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_receive.asm b/tests/test_receive.asm
index 58de94b..af602a0 100644
--- a/tests/test_receive.asm
+++ b/tests/test_receive.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(0)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_RECEIVE MONO
-        SU_RECEIVE MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(0)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_RECEIVE STEREO(0)
+        SU_RECEIVE STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_receive_stereo.asm b/tests/test_receive_stereo.asm
index 573e0c9..76956c3 100644
--- a/tests/test_receive_stereo.asm
+++ b/tests/test_receive_stereo.asm
@@ -12,13 +12,13 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(1),SENDPOP(0)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_SEND    MONO,AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1)
-        SU_RECEIVE STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(5),PORT(1),SENDPOP(0)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_SEND    STEREO(0),AMOUNT(128),VOICE(0),UNIT(5),PORT(0),SENDPOP(1)
+        SU_RECEIVE STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_send.asm b/tests/test_send.asm
index fc2067c..b353e0e 100644
--- a/tests/test_send.asm
+++ b/tests/test_send.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_SEND    MONO,AMOUNT(96),VOICE(0),UNIT(5),PORT(0),SENDPOP(0)
-        SU_SEND    MONO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_SEND    MONO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_SEND    STEREO(0),AMOUNT(96),VOICE(0),UNIT(5),PORT(0),SENDPOP(0)
+        SU_SEND    STEREO(0),AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_SEND    STEREO(0),AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_send_global.asm b/tests/test_send_global.asm
index 4acbf78..428a55a 100644
--- a/tests/test_send_global.asm
+++ b/tests/test_send_global.asm
@@ -12,18 +12,18 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_SEND    MONO,AMOUNT(96),VOICE(2),UNIT(3),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_SEND    STEREO(0),AMOUNT(96),VOICE(2),UNIT(3),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_SEND    MONO,AMOUNT(96),VOICE(1),UNIT(2),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_SEND    STEREO(0),AMOUNT(96),VOICE(1),UNIT(2),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_send_stereo.asm b/tests/test_send_stereo.asm
index c4eb923..a1d8623 100644
--- a/tests/test_send_stereo.asm
+++ b/tests/test_send_stereo.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_SEND    STEREO,AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_LOADVAL MONO,VALUE(64)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_SEND    STEREO,AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
-        SU_RECEIVE STEREO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_SEND    STEREO(1),AMOUNT(96),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_LOADVAL STEREO(0),VALUE(64)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_SEND    STEREO(1),AMOUNT(128),VOICE(0),UNIT(6),PORT(0),SENDPOP(1)
+        SU_RECEIVE STEREO(1)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_speed.asm b/tests/test_speed.asm
index f2c5b56..8a245e1 100644
--- a/tests/test_speed.asm
+++ b/tests/test_speed.asm
@@ -15,16 +15,16 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128)
-        SU_ENVELOPE   MONO,ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128)
-        SU_OSCILLATOR MONO,TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_OSCILLATOR MONO,TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
-        SU_MULP       STEREO
-        SU_OUT        STEREO,GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128)
+        SU_ENVELOPE   STEREO(0),ATTACK(64),DECAY(64),SUSTAIN(0),RELEASE(64),GAIN(128)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(64),DETUNE(32),PHASE(0),COLOR(96),SHAPE(64),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_OSCILLATOR STEREO(0),TRANSPOSE(72),DETUNE(64),PHASE(64),COLOR(64),SHAPE(96),GAIN(128),TYPE(TRISAW),LFO(0),UNISON(0)
+        SU_MULP       STEREO(1)
+        SU_OUT        STEREO(1),GAIN(128)
     END_INSTRUMENT
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADNOTE MONO
-        SU_SPEED    MONO
+        SU_LOADNOTE STEREO(0)
+        SU_SPEED    
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_xch.asm b/tests/test_xch.asm
index 0aa5c76..7d57b4e 100644
--- a/tests/test_xch.asm
+++ b/tests/test_xch.asm
@@ -12,10 +12,10 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_XCH     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_XCH     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH
 
diff --git a/tests/test_xch_stereo.asm b/tests/test_xch_stereo.asm
index f726794..1b9aeaf 100644
--- a/tests/test_xch_stereo.asm
+++ b/tests/test_xch_stereo.asm
@@ -12,14 +12,14 @@ END_TRACKS
 
 BEGIN_PATCH
     BEGIN_INSTRUMENT VOICES(1)
-        SU_LOADVAL MONO,VALUE(0)
-        SU_LOADVAL MONO,VALUE(128)
-        SU_LOADVAL MONO,VALUE(32)
-        SU_LOADVAL MONO,VALUE(96)
-        SU_XCH     STEREO
-        SU_POP     MONO
-        SU_POP     MONO
-        SU_OUT     STEREO,GAIN(128)
+        SU_LOADVAL STEREO(0),VALUE(0)
+        SU_LOADVAL STEREO(0),VALUE(128)
+        SU_LOADVAL STEREO(0),VALUE(32)
+        SU_LOADVAL STEREO(0),VALUE(96)
+        SU_XCH     STEREO(1)
+        SU_POP     STEREO(0)
+        SU_POP     STEREO(0)
+        SU_OUT     STEREO(1),GAIN(128)
     END_INSTRUMENT
 END_PATCH