fix octave calculation
fix triangle
allow mixing voice types