cleaned up/ tweaked octave shift/ set up switch for event type