diff --git a/lumps/genmidi/config.py b/lumps/genmidi/config.py
index 48fae1ed..b44aada7 100644
--- a/lumps/genmidi/config.py
+++ b/lumps/genmidi/config.py
@@ -36,190 +36,312 @@
 from instrument import Instrument, NullInstrument
 from midi import *
 
-# General MIDI instruments:
+# Note: all instruments must ALWAYS be defined, or use NullInstrument.
 
+# General MIDI instruments:
 INSTRUMENTS = [
-    Instrument("instr001.sbi"),  # #001 - Acoustic Grand Piano
-    Instrument("instr002.sbi"),  # #002 - Bright Acoustic Piano
-    Instrument("instr003.sbi"),  # #003 - Electric Grand Piano
-    Instrument("instr004.sbi", "instr004-2.sbi"),  # #004 - Honky-tonk Piano
-    Instrument("instr005.sbi", "instr005-2.sbi"),  # #005 - Electric Piano 1
-    Instrument("instr006.sbi", off1=-12),  # #006 - Electric Piano 2
-    Instrument("instr007.sbi"),  # #007 - Harpsichord
-    Instrument("instr008.sbi", off1=-12),  # #008 - Clavi
-    Instrument("instr009.sbi", off1=-12),  # #009 - Celesta
-    Instrument("instr010.sbi", off1=-12),  # #010 - Glockenspiel
-    Instrument("instr011.sbi", off1=-12),  # #011 - Music Box
-    Instrument("instr012.sbi", off1=-12),  # #012 - Vibraphone
-    Instrument("instr013.sbi", off1=-12),  # #013 - Marimba
-    Instrument("instr014.sbi", off1=-12),  # #014 - Xylophone
-    Instrument("instr015.sbi", off1=-12),  # #015 - Tubular Bells
-    Instrument("instr016.sbi", off1=-12),  # #016 - Dulcimer
-    Instrument("instr017.sbi", off1=-12),  # #017 - Drawbar Organ
-    Instrument("instr018.sbi", off1=-12),  # #018 - Percussive Organ
-    Instrument("instr019.sbi", off1=-12),  # #019 - Rock Organ
-    Instrument("instr020.sbi", off1=-12),  # #020 - Church Organ
-    Instrument("instr021.sbi", off1=-12),  # #021 - Reed Organ
-    Instrument("instr022.sbi", off1=-12),  # #022 - Accordion
-    Instrument("instr023.sbi", off1=-12),  # #023 - Harmonica
-    Instrument("instr024.sbi", off1=-12),  # #024 - Tango Accordion
-    Instrument("instr025.sbi", off1=-12),  # #025 - Acoustic Guitar (nylon)
-    Instrument("instr026.sbi", off1=-12),  # #026 - Acoustic Guitar (steel)
-    Instrument("instr027.sbi", off1=-12),  # #027 - Electric Guitar (jazz)
-    Instrument("instr028.sbi", off1=-12),  # #028 - Electric Guitar (clean)
-    Instrument("instr029.sbi", off1=-12),  # #029 - Electric Guitar (muted)
-    Instrument("instr030.sbi", off1=-12),  # #030 - Overdriven Guitar
-    Instrument("instr031.sbi", off1=-12),  # #031 - Distortion Guitar
-    Instrument("instr032.sbi", off1=-12),  # #032 - Guitar harmonics
-    Instrument("instr033.sbi", off1=-12),  # #033 - Acoustic Bass
-    Instrument("instr034.sbi", off1=-12),  # #034 - Electric Bass (finger)
-    Instrument("instr035.sbi", off1=-12),  # #035 - Electric Bass (pick)
-    Instrument("instr036.sbi", off1=-12),  # #036 - Fretless Bass
-    Instrument("instr037.sbi", off1=-12),  # #037 - Slap Bass 1
-    Instrument("instr038.sbi", off1=-12),  # #038 - Slap Bass 2
-    Instrument("instr039.sbi", off1=-12),  # #039 - Synth Bass 1
-    Instrument("instr040.sbi", off1=-12),  # #040 - Synth Bass 2
-    Instrument("instr041.sbi", off1=-12),  # #041 - Violin
-    Instrument("instr042.sbi", off1=-12),  # #042 - Viola
-    Instrument("instr043.sbi", off1=-12),  # #043 - Cello
-    Instrument("instr044.sbi", off1=-12),  # #044 - Contrabass
-    Instrument("instr045.sbi", off1=-12),  # #045 - Tremolo Strings
-    Instrument("instr046.sbi", off1=-12),  # #046 - Pizzicato Strings
-    Instrument("instr047.sbi", off1=-12),  # #047 - Orchestral Harp
-    Instrument("instr048.sbi", off1=-12),  # #048 - Timpani
-    Instrument("instr049.sbi", off1=-12),  # #049 - String Ensemble 1
-    Instrument("instr050.sbi", off1=-12),  # #050 - String Ensemble 2
-    Instrument("instr051.sbi", off1=-12),  # #051 - SynthStrings 1
-    Instrument("instr052.sbi", off1=-12),  # #052 - SynthStrings 2
-    Instrument("instr053.sbi", off1=-12),  # #053 - Choir Aahs
-    Instrument("instr054.sbi", off1=-12),  # #054 - Voice Oohs
-    Instrument("instr055.sbi", off1=-12),  # #055 - Synth Voice
-    Instrument("instr056.sbi", off1=-12),  # #056 - Orchestra Hit
-    Instrument("instr057.sbi", off1=-12),  # #057 - Trumpet
-    Instrument("instr058.sbi", off1=-12),  # #058 - Trombone
-    Instrument("instr059.sbi", off1=-12),  # #059 - Tuba
-    Instrument("instr060.sbi", off1=-12),  # #060 - Muted Trumpet
-    Instrument("instr061.sbi", off1=-12),  # #061 - French Horn
-    Instrument("instr062.sbi", off1=-12),  # #062 - Brass Section
-    Instrument("instr063.sbi", off1=-12),  # #063 - SynthBrass 1
-    Instrument("instr064.sbi", off1=-12),  # #064 - SynthBrass 2
-    Instrument("instr065.sbi", off1=-12),  # #065 - Soprano Sax
-    Instrument("instr066.sbi", off1=-12),  # #066 - Alto Sax
-    Instrument("instr067.sbi", off1=-12),  # #067 - Tenor Sax
-    Instrument("instr068.sbi", off1=-12),  # #068 - Baritone Sax
-    Instrument("instr069.sbi", off1=-12),  # #069 - Oboe
-    Instrument("instr070.sbi", off1=-12),  # #070 - English Horn
-    Instrument("instr071.sbi", off1=-12),  # #071 - Bassoon
-    Instrument("instr072.sbi", off1=-12),  # #072 - Clarinet
-    Instrument("instr073.sbi", off1=-12),  # #073 - Piccolo
-    Instrument("instr074.sbi", off1=-12),  # #074 - Flute
-    Instrument("instr075.sbi", off1=-12),  # #075 - Recorder
-    Instrument("instr076.sbi", off1=-12),  # #076 - Pan Flute
-    Instrument("instr077.sbi", off1=-12),  # #077 - Blown Bottle
-    Instrument("instr078.sbi", off1=-12),  # #078 - Shakuhachi
-    Instrument("instr079.sbi", off1=-12),  # #079 - Whistle
-    Instrument("instr080.sbi", off1=-12),  # #080 - Ocarina
-    Instrument("instr081.sbi", off1=-12),  # #081 - Lead 1 (square)
-    Instrument("instr082.sbi"),  # #082 - Lead 2 (sawtooth)
-    Instrument("instr083.sbi", off1=-12),  # #083 - Lead 3 (calliope)
-    Instrument("instr084.sbi", off1=-12),  # #084 - Lead 4 (chiff)
-    Instrument("instr085.sbi", off1=-12),  # #085 - Lead 5 (charang)
-    Instrument("instr086.sbi", off1=-12),  # #086 - Lead 6 (voice)
-    Instrument("instr087.sbi", off1=-12),  # #087 - Lead 7 (fifths)
-    Instrument("instr088.sbi", off1=-12),  # #088 - Lead 8 (bass + lead)
-    Instrument("instr089.sbi", off1=-12),  # #089 - Pad 1 (new age)
-    Instrument("instr090.sbi", off1=-12),  # #090 - Pad 2 (warm)
-    Instrument("instr091.sbi", off1=-12),  # #091 - Pad 3 (polysynth)
-    Instrument("instr092.sbi", off1=-12),  # #092 - Pad 4 (choir)
-    Instrument("instr093.sbi", off1=-12),  # #093 - Pad 5 (bowed)
-    Instrument("instr094.sbi", off1=-12),  # #094 - Pad 6 (metallic)
-    Instrument("instr095.sbi", off1=-12),  # #095 - Pad 7 (halo)
-    Instrument("instr096.sbi", off1=-12),  # #096 - Pad 8 (sweep)
-    Instrument("instr097.sbi", off1=-12),  # #097 - FX 1 (rain)
-    Instrument("instr098.sbi", off1=-12),  # #098 - FX 2 (soundtrack)
-    Instrument("instr099.sbi", off1=-12),  # #099 - FX 3 (crystal)
-    Instrument("instr100.sbi", off1=-12),  # #100 - FX 4 (atmosphere)
-    Instrument("instr101.sbi", off1=-12),  # #101 - FX 5 (brightness)
-    Instrument("instr102.sbi", off1=-12),  # #102 - FX 6 (goblins)
-    Instrument("instr103.sbi", off1=-12),  # #103 - FX 7 (echoes)
-    Instrument("instr104.sbi", off1=-12),  # #104 - FX 8 (sci-fi)
-    Instrument("instr105.sbi", off1=-12),  # #105 - Sitar
-    Instrument("instr106.sbi", off1=-12),  # #106 - Banjo
-    Instrument("instr107.sbi", off1=-12),  # #107 - Shamisen
-    Instrument("instr108.sbi", off1=-12),  # #108 - Koto
-    Instrument("instr109.sbi", off1=-12),  # #109 - Kalimba
-    Instrument("instr110.sbi", off1=-12),  # #110 - Bag pipe
-    Instrument("instr111.sbi", off1=-12),  # #111 - Fiddle
-    Instrument("instr112.sbi", off1=-12),  # #112 - Shanai
-    Instrument("instr113.sbi", off1=-12),  # #113 - Tinkle Bell
-    Instrument("instr114.sbi", off1=-12),  # #114 - Agogo
-    Instrument("instr115.sbi", off1=-12),  # #115 - Steel Drums
-    Instrument("instr116.sbi", off1=-12),  # #116 - Woodblock
-    Instrument("instr117.sbi", off1=-12),  # #117 - Taiko Drum
-    Instrument("instr118.sbi", off1=-12),  # #118 - Melodic Tom
-    Instrument("instr119.sbi", off1=-12),  # #119 - Synth Drum
-    Instrument("instr120.sbi", off1=-12),  # #120 - Reverse Cymbal
-    Instrument("instr121.sbi", off1=-12),  # #121 - Guitar Fret Noise
-    Instrument("instr122.sbi", off1=-12),  # #122 - Breath Noise
-    Instrument("instr123.sbi", off1=-12),  # #123 - Seashore
-    Instrument("instr124.sbi", off1=-12),  # #124 - Bird Tweet
-    Instrument("instr125.sbi", off1=-12),  # #125 - Telephone Ring
-    Instrument("instr126.sbi", off1=-12),  # #126 - Helicopter
-    Instrument("instr127.sbi", off1=-12),  # #127 - Applause
-    Instrument("instr128.sbi", off1=-12),  # #128 - Gunshot
+	Instrument('instr001.sbi', 'instr001-2.sbi',  # Acoustic Grand Piano
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr002.sbi', 'instr002-2.sbi',  # Bright Acoustic Piano
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr003.sbi', 'instr003-2.sbi',  # Electric Grand Piano
+	           tune=+2),
+	Instrument('instr004.sbi', 'instr004-2.sbi',  # Honky-tonk Piano
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr005.sbi', 'instr005-2.sbi',  # Electric Piano (Rhodes)
+	           off1=-12, off2=-12, tune=+3),
+	Instrument('instr006.sbi', 'instr006-2.sbi',  # Electric Piano (DX-7)
+	           off1=-12, off2=-12, tune=+4),
+	Instrument('instr007.sbi', 'instr007-2.sbi',  # Harpsichord
+	           off1=-12, off2=-12),
+	Instrument('instr008.sbi', 'instr008-2.sbi',  # Clavichord
+	           off1=-12, off2=-12),
+	Instrument('instr009.sbi', 'instr009-2.sbi',  # Celesta
+	           off1=-12, off2=-12, tune=+1),
+	Instrument('instr010.sbi', 'instr010-2.sbi',  # Glockenspiel
+	           off1=-24, off2=-24),
+	Instrument('instr011.sbi', 'instr011-2.sbi',  # Music Box
+	           off1=-12, tune=+4),
+	Instrument('instr012.sbi', 'instr012-2.sbi',  # Vibraphone
+	           off1=-12, off2=-12),
+	Instrument('instr013.sbi', 'instr013-2.sbi',  # Marimba
+	           off2=-12),
+	Instrument('instr014.sbi', off1=-12),         # Xylophone
+	Instrument('instr015.sbi', 'instr015-2.sbi',  # Tubular Bells
+	           off1=-24, off2=-24, tune=+2),
+	Instrument('instr016.sbi', 'instr016-2.sbi',  # Dulcimer
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr017.sbi', 'instr017-2.sbi',  # Drawbar Organ
+	           off1=-12, tune=+10),
+	Instrument('instr018.sbi', 'instr018-2.sbi',  # Percussive Organ
+	           off1=-24, off2=-24),
+	Instrument('instr019.sbi', 'instr019-2.sbi',  # Rock Organ
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr020.sbi', 'instr020-2.sbi',  # Church Organ
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr021.sbi', 'instr021-2.sbi',  # Reed Organ
+	           off1=-12, off2=-12),
+	Instrument('instr022.sbi', 'instr022-2.sbi',  # Accordion
+	           off1=-12, off2=-12, tune=+9),
+	Instrument('instr023.sbi', 'instr023-2.sbi',  # Harmonica (DMX FIXED)
+	           off1=-12, off2=-12),
+	Instrument('instr024.sbi', 'instr024-2.sbi',  # Tango Accordion
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr025.sbi', 'instr025-2.sbi',  # Acoustic Guitar (nylon)
+	           off1=-12, off2=-24),
+	Instrument('instr026.sbi', 'instr026-2.sbi',  # Acoustic Guitar (steel)
+	           off1=-12, off2=-12, tune=+1),
+	Instrument('instr027.sbi', 'instr027-2.sbi',  # Electric Guitar (jazz)
+	           off1=-12, off2=-12),
+	Instrument('instr028.sbi', 'instr028-2.sbi',  # Electric Guitar (clean)
+	           off1=-12, off2=-12, tune=+3),
+	Instrument('instr029.sbi', 'instr029-2.sbi',  # Electric Guitar (muted)
+	           off1=-12, off2=-12),
+	Instrument('instr030.sbi', 'instr030-2.sbi',  # Overdriven Guitar
+	           off1=-12, off2=+2, tune=-122),
+	Instrument('instr031.sbi', 'instr031-2.sbi',  # Distortion Guitar
+	           off1=-12, off2=+2, tune=-122),
+	Instrument('instr032.sbi', 'instr032-2.sbi',  # Guitar Harmonics
+	           off1=-12, off2=-12, tune=+15),
+	Instrument('instr033.sbi', 'instr033-2.sbi',  # Acoustic Bass
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr034.sbi', 'instr034-2.sbi'), # Electric Bass (finger)
+	Instrument('instr035.sbi', 'instr035-2.sbi',  # Electric Bass (pick)
+	           off1=-12),
+	Instrument('instr036.sbi', 'instr036-2.sbi',  # Fretless Bass (DMX BUG FIX)
+	           off1=-12, off2=-12, tune=+3),
+	Instrument('instr037.sbi', 'instr037-2.sbi',  # Slap Bass 1
+	           off1=-12, off2=-12),
+	Instrument('instr038.sbi', 'instr038-2.sbi',  # Slap Bass 2
+	           off1=-12, off2=-12),
+	Instrument('instr039.sbi'),                   # Synth Bass 1
+	Instrument('instr040.sbi', 'instr040-2.sbi',  # Synth Bass 2
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr041.sbi', 'instr041-2.sbi',  # Violin
+	           off1=-12, off2=-12),
+	Instrument('instr042.sbi', off1=-12),         # Viola
+	Instrument('instr043.sbi', 'instr043-2.sbi',  # Cello
+	           off1=-12, off2=-12, tune=+1),
+	Instrument('instr044.sbi', off1=-12),         # Contrabass
+	Instrument('instr045.sbi', 'instr045-2.sbi',  # Tremolo Strings (DMX)
+	           off2=-12, tune=+5),
+	Instrument('instr046.sbi', 'instr046-2.sbi',  # Pizzicato String
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr047.sbi', 'instr047-2.sbi',  # Orchestral Harp
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr048.sbi', 'instr048-2.sbi',  # Timpani (DMX)
+	           off1=-36, off2=-12, tune=+2),
+	Instrument('instr049.sbi', 'instr049-2.sbi',  # String Ensemble 1 (DMX)
+	           off2=-12, tune=+5),
+	Instrument('instr050.sbi', 'instr050-2.sbi',  # String Ensemble 2 (DMX)
+	           off2=-12, tune=+5),
+	Instrument('instr051.sbi', 'instr051-2.sbi',  # SynthStrings 1
+	           off1=-12, off2=-24, tune=+4),
+	Instrument('instr052.sbi', 'instr052-2.sbi',  # SynthStrings 2
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr053.sbi', 'instr053-2.sbi',  # Choir Aahs
+	           off1=-12, off2=-24, tune=+9),
+	Instrument('instr054.sbi', 'instr054-2.sbi',  # Voice Oohs
+	           off1=-12, off2=-12, tune=+9),
+	Instrument('instr055.sbi', 'instr055-2.sbi',  # Synth Voice
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr056.sbi', 'instr056-2.sbi',  # Orchestra Hit
+	           off1=-12, off2=-12, tune=+8),
+	Instrument('instr057.sbi', off1=-12),         # Trumpet (DMX FIXED)
+	Instrument('instr058.sbi', 'instr058-2.sbi',  # Trombone
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr059.sbi', off1=-12),         # Tuba
+	Instrument('instr060.sbi', off1=-24),         # Muted Trumpet
+	Instrument('instr061.sbi', 'instr061-2.sbi',  # French Horn
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr062.sbi', 'instr062-2.sbi',  # Brass Section
+	           off1=-12, off2=-12, tune=+4),
+	Instrument('instr063.sbi', 'instr063-2.sbi',  # Synth Brass 1
+	           off1=-12, off2=-12, tune=+6),
+	Instrument('instr064.sbi', 'instr064-2.sbi',  # Synth Brass 2
+	           off1=-12, off2=-12, tune=+8),
+	Instrument('instr065.sbi', off1=-12),         # Soprano Sax
+	Instrument('instr066.sbi', off1=-12),         # Alto Sax
+	Instrument('instr067.sbi'),                   # Tenor Sax
+	Instrument('instr068.sbi'),                   # Baritone Sax
+	Instrument('instr069.sbi', 'instr069-2.sbi',  # Oboe
+	           off1=-12, off2=-12),
+	Instrument('instr070.sbi', off1=-12),         # English Horn
+	Instrument('instr071.sbi', off1=-12),         # Bassoon
+	Instrument('instr072.sbi', off1=-12),         # Clarinet (DMX FIXED)
+	Instrument('instr073.sbi', off1=-12),         # Piccolo
+	Instrument('instr074.sbi', off1=-12),         # Flute
+	Instrument('instr075.sbi', off1=-12),         # Recorder
+	Instrument('instr076.sbi', 'instr076-2.sbi',  # Pan Flute (DMX)
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr077.sbi', 'instr077-2.sbi',  # Blown Bottle
+	           off1=-12, off2=-12, tune=+3),
+	Instrument('instr078.sbi', 'instr078-2.sbi',  # Shakuhachi
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr079.sbi', off1=-12),         # Whistle
+	Instrument('instr080.sbi', off1=-12),         # Ocarina
+	Instrument('instr081.sbi', 'instr081-2.sbi',  # Lead 1 (square)
+	           off1=-12, off2=-12, tune=+8),
+	Instrument('instr082.sbi', 'instr082-2.sbi',  # Lead 2 (sawtooth)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr083.sbi', 'instr083-2.sbi',  # Lead 3 (calliope)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr084.sbi', 'instr084-2.sbi',  # Lead 4 (chiffer)
+	           off1=-12, off2=-12, tune=-2),
+	Instrument('instr085.sbi', off1=-12),         # Lead 5 (charang)
+	Instrument('instr086.sbi', 'instr086-2.sbi',  # Lead 6 (Voice)
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr087.sbi', 'instr087-2.sbi',  # Lead 7 (5th sawtooth)
+	           off2=-5, tune=-3),
+	Instrument('instr088.sbi', 'instr088-2.sbi',  # Lead 8 (Lead+Bass)
+	           tune=+2),
+	Instrument('instr089.sbi', 'instr089-2.sbi',  # Pad 1 (new age)
+	           off1=-12, off2=-12, tune=+5),
+	Instrument('instr090.sbi', 'instr090-2.sbi',  # Pad 2 (warm)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr091.sbi', 'instr091-2.sbi',  # Pad 3 (polysynth)
+	           off1=-12, off2=-12, tune=+5),
+	Instrument('instr092.sbi', 'instr092-2.sbi',  # Pad 4 (choir)
+	           off1=-12, off2=-12, tune=+10),
+	Instrument('instr093.sbi', 'instr093-2.sbi',  # Pad 5 (bowed glass)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr094.sbi', 'instr094-2.sbi',  # Pad 6 (metal)
+	           off1=-12, off2=-12, tune=+4),
+	Instrument('instr095.sbi', 'instr095-2.sbi',  # Pad 7 (halo)
+	           off1=-12, off2=-12, tune=+6),
+	Instrument('instr096.sbi', 'instr096-2.sbi',  # Pad 8 (sweep)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr097.sbi', 'instr097-2.sbi',  # FX 1 (rain)
+	           off1=-12, off2=-12, tune=+6),
+	Instrument('instr098.sbi', 'instr098-2.sbi',  # FX 2 (soundtrack)
+	           off1=-12, off2=-5, tune=+8),
+	Instrument('instr099.sbi', 'instr099-2.sbi',  # FX 3 (crystal)
+	           off1=-12, off2=-12, tune=+7),
+	Instrument('instr100.sbi', 'instr100-2.sbi',  # FX 4 (atmosphere)
+	           off1=-12, off2=-12, tune=-3),
+	Instrument('instr101.sbi', 'instr101-2.sbi',  # FX 5 (brightness)
+	           off1=-12, off2=-12, tune=+8),
+	Instrument('instr102.sbi', 'instr102-2.sbi',  # FX 6 (goblin)
+	           off1=-12, off2=-12, tune=-5),
+	Instrument('instr103.sbi', 'instr103-2.sbi',  # FX 7 (echo drops)
+	           off1=-12, off2=-12, tune=+9),
+	Instrument('instr104.sbi', 'instr104-2.sbi',  # * FX 8 (star-theme)
+	           off1=-12, off2=-12, tune=+5),
+	Instrument('instr105.sbi', 'instr105-2.sbi',  # Sitar
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr106.sbi', 'instr106-2.sbi',  # Banjo
+	           off1=-12, off2=-12),
+	Instrument("instr107.sbi", off1=-12),         # #107 - Shamisen
+	Instrument('instr108.sbi', off1=-12),         # Koto
+	Instrument('instr109.sbi', off1=-12),         # Kalimba
+	Instrument('instr110.sbi', 'instr110-2.sbi',  # Bag Pipe
+	           off1=-12, off2=-12, tune=+4),
+	Instrument('instr111.sbi', off1=-12),         # Fiddle
+	Instrument('instr112.sbi', off1=-12),         # Shanai
+	Instrument('instr113.sbi', off1=-7),          # Tinkle Bell
+	Instrument('instr114.sbi', off1=-12),         # Agogo
+	Instrument('instr115.sbi', 'instr115-2.sbi',  # Steel Drums
+	           off1=-12, off2=-12, tune=+2),
+	Instrument('instr116.sbi', off1=-12),         # Woodblock
+	Instrument('instr117.sbi', 'instr117-2.sbi',  # Taiko Drum (new)
+	           off1=-24, off2=-12),
+	Instrument('instr118.sbi', 'instr118-2.sbi',  # Melodic Tom
+	           off1=-12),
+	Instrument('instr119.sbi', 'instr119-2.sbi',  # Synth Drum
+	           off1=-24, off2=-12),
+	Instrument('instr120.sbi', 'instr120-2.sbi',  # Reverse Cymbal
+	           off1=-12, tune=+7),
+	Instrument('instr121.sbi', off1=-26),         # Guitar Fret Noise (DMX)
+	Instrument('instr122.sbi', 'instr122-2.sbi',  # Breath Noise
+	           off1=-12, off2=-12),
+	Instrument('instr123.sbi', 'instr123-2.sbi',  # Seashore
+	           note=O0.F, off1=-35, off2=-36),
+	Instrument('instr124.sbi'),                   # Bird Tweet
+	Instrument('instr125.sbi', 'instr125-2.sbi',  # Telephone Ring
+	           off1=-36, off2=-32),
+	Instrument('instr126.sbi', 'instr126-2.sbi',  # Helicopter
+	           note=On4.F, off1=-48, off2=-26),
+	Instrument('instr127.sbi', 'instr127-2.sbi',  # Applause
+	           note=O0.F, off1=-48, off2=-47),
+	Instrument('instr128.sbi', off1=-12),         # Gun Shot
 ]
 
 # Percussion instruments:
-# Note: Many of these instruments have not been defined yet.
-# As these are percussion instruments, a note number should ALWAYS be
-# specified.
-
 PERCUSSION = [
-    Instrument("perc35.sbi", note=On4.A),  # #35 Acoustic Bass Drum
-    Instrument("perc36.sbi", note=On4.A),  # #36 Bass Drum 1
-    Instrument("perc37.sbi", note=On1.C),  # #37 Side Stick
-    Instrument("perc38.sbi", note=On3.Gs),  # #38 Acoustic Snare
-    Instrument("perc39.sbi", note=O3.C),  # #39 Hand Clap
-    Instrument("perc40.sbi", note=On1.Cs),  # #40 Electric Snare
-    Instrument("perc41.sbi", note=On3.D),  # #41 Low Floor Tom
-    Instrument("perc42.sbi", note=O1.Gs),  # #42 Closed Hi Hat
-    Instrument("perc43.sbi", note=On3.Gs),  # #43 High Floor Tom
-    Instrument("perc44.sbi", note=O1.Gs),  # #44 Pedal Hi-Hat
-    Instrument("perc45.sbi", note=On2.C),  # #45 Low Tom
-    Instrument("perc46.sbi", note=O1.Gs),  # #46 Open Hi-Hat
-    Instrument("perc47.sbi", note=On2.Fs),  # #47 Low-Mid Tom
-    Instrument("perc48.sbi", note=On2.A),  # #48 Hi-Mid Tom
-    Instrument("perc49.sbi", note=On1.C),  # #49 Crash Cymbal 1
-    Instrument("perc50.sbi", note=On1.Cs),  # #50 High Tom
-    Instrument("perc51.sbi", note=On1.B),  # #51 Ride Cymbal 1
-    Instrument("perc52.sbi", note=On1.C),  # #52 Chinese Cymbal
-    Instrument("perc53.sbi", note=O1.E),  # #53 Ride Bell
-    Instrument("perc54.sbi", note=O0.E),  # #54 Tambourine
-    NullInstrument,  # TODO - #55 Splash Cymbal
-    NullInstrument,  # TODO - #56 Cowbell
-    Instrument("perc57.sbi", note=On1.As),  # #57 Crash Cymbal 2
-    NullInstrument,  # TODO - #58 Vibraslap
-    Instrument("perc59.sbi", note=O0.E),  # #59 Ride Cymbal 2
-    NullInstrument,  # TODO - #60 Hi Bongo
-    NullInstrument,  # TODO - #61 Low Bongo
-    NullInstrument,  # TODO - #62 Mute Hi Conga
-    NullInstrument,  # TODO - #63 Open Hi Conga
-    NullInstrument,  # TODO - #64 Low Conga
-    NullInstrument,  # TODO - #65 High Timbale
-    NullInstrument,  # TODO - #66 Low Timbale
-    NullInstrument,  # TODO - #67 High Agogo
-    NullInstrument,  # TODO - #68 Low Agogo
-    NullInstrument,  # TODO - #69 Cabasa
-    Instrument("perc70.sbi", note=On5.E),  # #70 Maracas
-    Instrument("perc71.sbi", note=On5.E),  # #71 Short Whistle
-    Instrument("perc72.sbi", note=On5.E),  # #72 Long Whistle
-    Instrument("perc73.sbi", note=On5.E),  # #73 Short Guiro
-    Instrument("perc74.sbi", note=On5.E),  # #74 Long Guiro
-    Instrument("perc75.sbi", note=On5.E),  # #75 Claves
-    Instrument("perc76.sbi", note=On5.E),  # #76 Hi Wood Block
-    Instrument("perc77.sbi", note=On5.E),  # #77 Low Wood Block
-    Instrument("perc78.sbi", note=On5.E),  # #78 Mute Cuica
-    Instrument("perc79.sbi", note=On5.E),  # #79 Open Cuica
-    Instrument("perc80.sbi", note=On5.E),  # #80 Mute Triangle
-    Instrument("perc81.sbi", note=On5.E),  # #81 Open Triangle
+	Instrument('perc35.sbi', note=On3.Cs),        # Acoustic Bass Drum
+	Instrument("perc36.sbi", note=On4.A),         # #36 Bass Drum 1
+	Instrument('perc37.sbi', 'perc37-2.sbi',      # Slide Stick
+	           note=O0.Cs),
+	Instrument('perc38.sbi', 'perc38-2.sbi',      # Acoustic Snare
+	           note=On2.D, off1=-12),
+	Instrument('perc39.sbi', 'perc39-2.sbi',      # Hand Clap
+	           note=On2.Cs, off1=-12, off2=-14),
+	Instrument('perc40.sbi', 'perc40-2.sbi',      # Electric Snare
+	           note=On2.D, off1=-4, off2=-11),
+	Instrument('perc41.sbi',                      # Low Floor Tom
+	           note=On3.Gs, off1=-12),
+	Instrument('perc42.sbi', 'perc42-2.sbi',      # Closed High-Hat
+	           note=On1.C, off1=-17, off2=-12, tune=-122),
+	Instrument('perc43.sbi',                      # High Floor Tom
+	           note=On3.As, off1=-12),
+	Instrument('perc44.sbi',                      # Pedal High Hat
+	           note=On1.C, off1=-17),
+	Instrument('perc45.sbi',                      # Low Tom
+	           note=On2.Cs, off1=-12),
+	Instrument('perc46.sbi', 'perc46-2.sbi',      # Open High Hat
+	           note=On1.C, off1=-17, off2=-12, tune=-122),
+	Instrument('perc47.sbi',                      # Low-Mid Tom
+	           note=On2.E, off1=-12),
+	Instrument('perc48.sbi',                      # Hi-Mid Tom
+	           note=On2.G, off1=-12),
+	Instrument('perc49.sbi', 'perc49-2.sbi',      # Crash Cymbal 1
+	           note=O0.Cs, tune=+6),
+	Instrument('perc50.sbi',                      # High Tom
+	           note=On2.As, off1=-12),
+	Instrument('perc51.sbi', 'perc51-2.sbi',      # Ride Cymbal 1
+	           note=O0.C, tune=+4),
+	Instrument('perc52.sbi', 'perc52-2.sbi',      # Chinses Cymbal
+	           note=O1.G, off2=-1, tune=+5),
+	Instrument('perc53.sbi',                      # Ride Bell
+	           note=O0.D, off1=-12),
+	Instrument('perc54.sbi', 'perc54-2.sbi',      # Tambourine
+	           note=O1.Gs, tune=+8),
+	Instrument('perc55.sbi', 'perc55-2.sbi',      # Splash Cymbal
+	           note=O0.G, off1=-12, off2=-11, tune=+5),
+	Instrument('perc56.sbi', note=On1.As),        # Cowbell
+	Instrument('perc57.sbi', 'perc57-2.sbi',      # Crash Cymbal 2
+	           note=O0.D, tune=+6),
+	Instrument('perc58.sbi', note=On3.C),         # Vibraslap
+	Instrument('perc59.sbi', note=O0.Cs),         # Ride Cymbal 2
+	Instrument('perc60.sbi', 'perc60-2.sbi',      # High Bongo (New)
+	           note=On2.F, off1=-6, off2=-12),
+	Instrument('perc61.sbi', 'perc61-2.sbi',      # Low Bongo (New)
+	           note=On3.B, off2=-12),
+	Instrument('perc62.sbi', 'perc62-2.sbi',      # Mute high conga (New)
+	           note=On3.F, off1=-12, off2=-2),
+	Instrument('perc63.sbi', 'perc63-2.sbi',      # Open High Conga (New)
+	           note=On2.F, off1=-4, off2=-12),
+	Instrument('perc64.sbi', 'perc64-2.sbi',      # Low Conga (New)
+	           note=On2.Cs, off1=-4, off2=-12),
+	Instrument('perc65.sbi', note=On1.G),         # High Timbale
+	Instrument('perc66.sbi', note=On1.C),         # Low Timbale
+	Instrument('perc67.sbi', 'perc67-2.sbi',      # High Agogo
+	           note=O1.Fs, off2=-6),
+	Instrument('perc68.sbi', 'perc68-2.sbi',      # Low Agogo
+	           note=O1.Cs, off2=-1),
+	NullInstrument,                               # TODO - #69 Cabasa
+	Instrument('perc70.sbi', note=On2.E),         # Maracas
+	Instrument('perc71.sbi', note=On2.A),         # Short Whistle
+	Instrument('perc72.sbi', note=On2.Fs),        # Long Whistle
+	Instrument('perc73.sbi', 'perc73-2.sbi',      # Short Guiro
+	           note=On1.C, off1=-12, off2=-12),
+	Instrument('perc74.sbi', 'perc74-2.sbi',      # Long Guiro
+	           note=On1.C, off1=-12, off2=-12),
+	Instrument('perc75.sbi', note=O1.Cs),         # Claves
+	Instrument("perc76.sbi", note=On5.E),         # #76 Hi Wood Block
+	Instrument("perc77.sbi", note=On5.E),         # #77 Low Wood Block
+	Instrument('perc78.sbi', note=On4.E),         # Mute Cuica
+	Instrument('perc79.sbi', note=On4.E),         # Open Cuica
+	Instrument('perc80.sbi', note=O2.Fs),         # Mute Triangle
+	Instrument('perc81.sbi', note=O2.Fs),         # Open Triangle
 ]
diff --git a/lumps/genmidi/dumpgenmidi b/lumps/genmidi/dumpgenmidi
index add554c0..1cddb4c1 100644
--- a/lumps/genmidi/dumpgenmidi
+++ b/lumps/genmidi/dumpgenmidi
@@ -26,23 +26,41 @@ def instr_to_str_def(filename, filename2, instr):
     if is_null_voice(instr.voice1):
         return "NullInstrument"
 
-    args = ['"%s"' % filename]
+    file_args = "%r" % filename
 
     if instr.voice2 is not None:
-        args.append('"%s"' % filename2)
+        file_args += ", %r" % filename2
 
+    instr_name = instr.voice1["name"]
+
+    extra_args = []
     if instr.fixed_note is not None:
-        args.append("note=%s" % midi.def_for_note(instr.fixed_note))
+        extra_args.append("note=%s" % midi.def_for_note(instr.fixed_note))
     if instr.offset1 != 0:
-        args.append("off1=%i" % instr.offset1)
+        extra_args.append("off1=%+i" % instr.offset1)
     if instr.offset2 != 0:
-        args.append("off2=%i" % instr.offset2)
+        extra_args.append("off2=%+i" % instr.offset2)
+    if instr.tune != 0:
+        extra_args.append("tune=%+i" % instr.tune)
 
-    return "Instrument(%s)" % (", ".join(args))
+    extra_args = ", ".join(extra_args)
+    if extra_args:
+        file_args += ", "
+
+    if len(file_args + extra_args) <= 32:
+        return "\tInstrument(%s%s), %s# %s" % (
+            file_args, extra_args,
+            " " * (32 - len(file_args + extra_args)),
+            instr_name)
+
+    return "\tInstrument(%s %s# %s\n\t           %s)," % (
+        file_args.strip(),
+         " " * (35 - len(file_args)), instr_name,
+         extra_args)
 
 
 def print_instr_def(filename, filename2, instr):
-    print("\t%s," % instr_to_str_def(filename, filename2, instr))
+    print(instr_to_str_def(filename, filename2, instr))
 
 
 def dump_instrument(filename, filename2, instr):
@@ -65,6 +83,9 @@ instruments = genmidi.read(sys.argv[1])
 main_instrs = instruments[0:128]
 percussion = instruments[128:]
 
+print("# Note: all instruments must ALWAYS be defined, or use NullInstrument.")
+print("")
+print("# General MIDI instruments:")
 print("INSTRUMENTS = [")
 
 for i in range(len(main_instrs)):
@@ -76,6 +97,7 @@ for i in range(len(main_instrs)):
 
 print("]")
 print("")
+print("# Percussion instruments:")
 print("PERCUSSION = [")
 
 for i in range(len(percussion)):
diff --git a/lumps/genmidi/genmidi.py b/lumps/genmidi/genmidi.py
index 93d6204f..19f579c7 100644
--- a/lumps/genmidi/genmidi.py
+++ b/lumps/genmidi/genmidi.py
@@ -78,7 +78,7 @@ def encode_instrument(instrument):
     else:
         fixed_note = 0
 
-    header = struct.pack("<hBB", flags, 128, fixed_note)
+    header = struct.pack("<hBB", flags, 128 + instrument.tune, fixed_note)
 
     return header + instr1_data + instr2_data
 
@@ -123,7 +123,7 @@ def decode_voice(data, name):
 
     result["m_ksl_volume"] = result["m_ksl"] | result["m_volume"]
     result["c_ksl_volume"] = result["c_ksl"] | result["c_volume"]
-    result["name"] = name.decode("ascii").rstrip("\0")
+    result["name"] = name.decode("ascii").rstrip("\0").rstrip()
 
     return result
 
@@ -149,7 +149,8 @@ def decode_instrument(data, name):
         fixed_note = None
 
     return Instrument(
-        voice1, voice2, off1=offset1, off2=offset2, note=fixed_note
+        voice1, voice2, off1=offset1, off2=offset2, note=fixed_note,
+        tune=finetune - 128
     )
 
 
diff --git a/lumps/genmidi/instrument.py b/lumps/genmidi/instrument.py
index 226e1aee..7c52821b 100644
--- a/lumps/genmidi/instrument.py
+++ b/lumps/genmidi/instrument.py
@@ -9,6 +9,8 @@ import sys
 import sbi_file
 import a2i_file
 
+DO_OPL2_CHECK = False
+
 # Check the specified instrument data is OPL2-compatible and does not
 # use any OPL3 features. Returns an error message, or 'None' if data
 # is valid.
@@ -50,13 +52,14 @@ def load_instrument(filename):
     else:
         raise Exception("Unknown instrument file type: '%s'" % filename)
 
-    check_opl2(filename, result)
+    if DO_OPL2_CHECK:
+        check_opl2(filename, result)
 
     return result
 
 
 class Instrument:
-    def __init__(self, file1, file2=None, off1=0, off2=0, note=None):
+    def __init__(self, file1, file2=None, off1=0, off2=0, note=None, tune=0):
         self.voice1 = load_instrument(file1)
 
         if file2 is not None:
@@ -67,6 +70,7 @@ class Instrument:
         self.fixed_note = note
         self.offset1 = off1
         self.offset2 = off2
+        self.tune = tune
 
 
 NullInstrument = Instrument("dummy.sbi")
diff --git a/lumps/genmidi/instruments/instr001-2.sbi b/lumps/genmidi/instruments/instr001-2.sbi
new file mode 100644
index 00000000..fe65fa4b
Binary files /dev/null and b/lumps/genmidi/instruments/instr001-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr001.sbi b/lumps/genmidi/instruments/instr001.sbi
index 7a2d3872..04eaa705 100644
Binary files a/lumps/genmidi/instruments/instr001.sbi and b/lumps/genmidi/instruments/instr001.sbi differ
diff --git a/lumps/genmidi/instruments/instr002-2.sbi b/lumps/genmidi/instruments/instr002-2.sbi
new file mode 100644
index 00000000..714ecf77
Binary files /dev/null and b/lumps/genmidi/instruments/instr002-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr002.sbi b/lumps/genmidi/instruments/instr002.sbi
index 70258f07..bde9e5f7 100644
Binary files a/lumps/genmidi/instruments/instr002.sbi and b/lumps/genmidi/instruments/instr002.sbi differ
diff --git a/lumps/genmidi/instruments/instr003-2.sbi b/lumps/genmidi/instruments/instr003-2.sbi
new file mode 100644
index 00000000..2bfca2c5
Binary files /dev/null and b/lumps/genmidi/instruments/instr003-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr003.sbi b/lumps/genmidi/instruments/instr003.sbi
index 4be8a065..286f146c 100644
Binary files a/lumps/genmidi/instruments/instr003.sbi and b/lumps/genmidi/instruments/instr003.sbi differ
diff --git a/lumps/genmidi/instruments/instr004-2.sbi b/lumps/genmidi/instruments/instr004-2.sbi
index 15f603e9..b7868ff1 100644
Binary files a/lumps/genmidi/instruments/instr004-2.sbi and b/lumps/genmidi/instruments/instr004-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr004.sbi b/lumps/genmidi/instruments/instr004.sbi
index 0aeef6ec..c026626f 100644
Binary files a/lumps/genmidi/instruments/instr004.sbi and b/lumps/genmidi/instruments/instr004.sbi differ
diff --git a/lumps/genmidi/instruments/instr005-2.sbi b/lumps/genmidi/instruments/instr005-2.sbi
index fc3ded68..0a4697b9 100644
Binary files a/lumps/genmidi/instruments/instr005-2.sbi and b/lumps/genmidi/instruments/instr005-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr005.sbi b/lumps/genmidi/instruments/instr005.sbi
index cb495519..141cba31 100644
Binary files a/lumps/genmidi/instruments/instr005.sbi and b/lumps/genmidi/instruments/instr005.sbi differ
diff --git a/lumps/genmidi/instruments/instr006-2.sbi b/lumps/genmidi/instruments/instr006-2.sbi
new file mode 100644
index 00000000..537eabd5
Binary files /dev/null and b/lumps/genmidi/instruments/instr006-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr006.sbi b/lumps/genmidi/instruments/instr006.sbi
index f4762a57..e317e936 100644
Binary files a/lumps/genmidi/instruments/instr006.sbi and b/lumps/genmidi/instruments/instr006.sbi differ
diff --git a/lumps/genmidi/instruments/instr007-2.sbi b/lumps/genmidi/instruments/instr007-2.sbi
new file mode 100644
index 00000000..8feffc7e
Binary files /dev/null and b/lumps/genmidi/instruments/instr007-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr007.sbi b/lumps/genmidi/instruments/instr007.sbi
index fb914b14..ac59826f 100644
Binary files a/lumps/genmidi/instruments/instr007.sbi and b/lumps/genmidi/instruments/instr007.sbi differ
diff --git a/lumps/genmidi/instruments/instr008-2.sbi b/lumps/genmidi/instruments/instr008-2.sbi
new file mode 100644
index 00000000..d7fb8854
Binary files /dev/null and b/lumps/genmidi/instruments/instr008-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr008.sbi b/lumps/genmidi/instruments/instr008.sbi
index e568b1e8..1db33c45 100644
Binary files a/lumps/genmidi/instruments/instr008.sbi and b/lumps/genmidi/instruments/instr008.sbi differ
diff --git a/lumps/genmidi/instruments/instr009-2.sbi b/lumps/genmidi/instruments/instr009-2.sbi
new file mode 100644
index 00000000..4667e45a
Binary files /dev/null and b/lumps/genmidi/instruments/instr009-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr009.sbi b/lumps/genmidi/instruments/instr009.sbi
index 15370849..72762302 100644
Binary files a/lumps/genmidi/instruments/instr009.sbi and b/lumps/genmidi/instruments/instr009.sbi differ
diff --git a/lumps/genmidi/instruments/instr010-2.sbi b/lumps/genmidi/instruments/instr010-2.sbi
new file mode 100644
index 00000000..a465c398
Binary files /dev/null and b/lumps/genmidi/instruments/instr010-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr010.sbi b/lumps/genmidi/instruments/instr010.sbi
index 4e789277..aa399152 100644
Binary files a/lumps/genmidi/instruments/instr010.sbi and b/lumps/genmidi/instruments/instr010.sbi differ
diff --git a/lumps/genmidi/instruments/instr011-2.sbi b/lumps/genmidi/instruments/instr011-2.sbi
new file mode 100644
index 00000000..618ee51d
Binary files /dev/null and b/lumps/genmidi/instruments/instr011-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr011.sbi b/lumps/genmidi/instruments/instr011.sbi
index 9684e145..f16756af 100644
Binary files a/lumps/genmidi/instruments/instr011.sbi and b/lumps/genmidi/instruments/instr011.sbi differ
diff --git a/lumps/genmidi/instruments/instr012-2.sbi b/lumps/genmidi/instruments/instr012-2.sbi
new file mode 100644
index 00000000..ce5374da
Binary files /dev/null and b/lumps/genmidi/instruments/instr012-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr012.sbi b/lumps/genmidi/instruments/instr012.sbi
index 75b30b0e..6124e25e 100644
Binary files a/lumps/genmidi/instruments/instr012.sbi and b/lumps/genmidi/instruments/instr012.sbi differ
diff --git a/lumps/genmidi/instruments/instr013-2.sbi b/lumps/genmidi/instruments/instr013-2.sbi
new file mode 100644
index 00000000..a405deba
Binary files /dev/null and b/lumps/genmidi/instruments/instr013-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr013.sbi b/lumps/genmidi/instruments/instr013.sbi
index 42cbbad8..1f4bbb7c 100644
Binary files a/lumps/genmidi/instruments/instr013.sbi and b/lumps/genmidi/instruments/instr013.sbi differ
diff --git a/lumps/genmidi/instruments/instr014.sbi b/lumps/genmidi/instruments/instr014.sbi
index de63e578..9e9da5f0 100644
Binary files a/lumps/genmidi/instruments/instr014.sbi and b/lumps/genmidi/instruments/instr014.sbi differ
diff --git a/lumps/genmidi/instruments/instr015-2.sbi b/lumps/genmidi/instruments/instr015-2.sbi
new file mode 100644
index 00000000..16c06d92
Binary files /dev/null and b/lumps/genmidi/instruments/instr015-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr015.sbi b/lumps/genmidi/instruments/instr015.sbi
index 75b4889a..e1dc1fa9 100644
Binary files a/lumps/genmidi/instruments/instr015.sbi and b/lumps/genmidi/instruments/instr015.sbi differ
diff --git a/lumps/genmidi/instruments/instr016-2.sbi b/lumps/genmidi/instruments/instr016-2.sbi
new file mode 100644
index 00000000..ed6bd6cd
Binary files /dev/null and b/lumps/genmidi/instruments/instr016-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr016.sbi b/lumps/genmidi/instruments/instr016.sbi
index 29f11fa4..ed6bd6cd 100644
Binary files a/lumps/genmidi/instruments/instr016.sbi and b/lumps/genmidi/instruments/instr016.sbi differ
diff --git a/lumps/genmidi/instruments/instr017-2.sbi b/lumps/genmidi/instruments/instr017-2.sbi
new file mode 100644
index 00000000..63701f8f
Binary files /dev/null and b/lumps/genmidi/instruments/instr017-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr017.sbi b/lumps/genmidi/instruments/instr017.sbi
index 6d09649a..08e4aadf 100644
Binary files a/lumps/genmidi/instruments/instr017.sbi and b/lumps/genmidi/instruments/instr017.sbi differ
diff --git a/lumps/genmidi/instruments/instr018-2.sbi b/lumps/genmidi/instruments/instr018-2.sbi
new file mode 100644
index 00000000..19ac30cd
Binary files /dev/null and b/lumps/genmidi/instruments/instr018-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr018.sbi b/lumps/genmidi/instruments/instr018.sbi
index 42be861c..821097eb 100644
Binary files a/lumps/genmidi/instruments/instr018.sbi and b/lumps/genmidi/instruments/instr018.sbi differ
diff --git a/lumps/genmidi/instruments/instr019-2.sbi b/lumps/genmidi/instruments/instr019-2.sbi
new file mode 100644
index 00000000..c35f714c
Binary files /dev/null and b/lumps/genmidi/instruments/instr019-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr019.sbi b/lumps/genmidi/instruments/instr019.sbi
index 3062566f..d5d27ec4 100644
Binary files a/lumps/genmidi/instruments/instr019.sbi and b/lumps/genmidi/instruments/instr019.sbi differ
diff --git a/lumps/genmidi/instruments/instr020-2.sbi b/lumps/genmidi/instruments/instr020-2.sbi
new file mode 100644
index 00000000..1ad973b0
Binary files /dev/null and b/lumps/genmidi/instruments/instr020-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr020.sbi b/lumps/genmidi/instruments/instr020.sbi
index ec6958c8..b324b1d7 100644
Binary files a/lumps/genmidi/instruments/instr020.sbi and b/lumps/genmidi/instruments/instr020.sbi differ
diff --git a/lumps/genmidi/instruments/instr021-2.sbi b/lumps/genmidi/instruments/instr021-2.sbi
new file mode 100644
index 00000000..afadbc18
Binary files /dev/null and b/lumps/genmidi/instruments/instr021-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr021.sbi b/lumps/genmidi/instruments/instr021.sbi
index 01115a30..911b5f72 100644
Binary files a/lumps/genmidi/instruments/instr021.sbi and b/lumps/genmidi/instruments/instr021.sbi differ
diff --git a/lumps/genmidi/instruments/instr022-2.sbi b/lumps/genmidi/instruments/instr022-2.sbi
new file mode 100644
index 00000000..86f5f141
Binary files /dev/null and b/lumps/genmidi/instruments/instr022-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr022.sbi b/lumps/genmidi/instruments/instr022.sbi
index 597c5b1c..dfd239e1 100644
Binary files a/lumps/genmidi/instruments/instr022.sbi and b/lumps/genmidi/instruments/instr022.sbi differ
diff --git a/lumps/genmidi/instruments/instr023-2.sbi b/lumps/genmidi/instruments/instr023-2.sbi
new file mode 100644
index 00000000..74601273
Binary files /dev/null and b/lumps/genmidi/instruments/instr023-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr023.sbi b/lumps/genmidi/instruments/instr023.sbi
index 67112159..2456ef15 100644
Binary files a/lumps/genmidi/instruments/instr023.sbi and b/lumps/genmidi/instruments/instr023.sbi differ
diff --git a/lumps/genmidi/instruments/instr024-2.sbi b/lumps/genmidi/instruments/instr024-2.sbi
new file mode 100644
index 00000000..e471a9f7
Binary files /dev/null and b/lumps/genmidi/instruments/instr024-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr024.sbi b/lumps/genmidi/instruments/instr024.sbi
index 7698027c..c25462af 100644
Binary files a/lumps/genmidi/instruments/instr024.sbi and b/lumps/genmidi/instruments/instr024.sbi differ
diff --git a/lumps/genmidi/instruments/instr025-2.sbi b/lumps/genmidi/instruments/instr025-2.sbi
new file mode 100644
index 00000000..e87bbdeb
Binary files /dev/null and b/lumps/genmidi/instruments/instr025-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr025.sbi b/lumps/genmidi/instruments/instr025.sbi
index 83707bec..f447e3a0 100644
Binary files a/lumps/genmidi/instruments/instr025.sbi and b/lumps/genmidi/instruments/instr025.sbi differ
diff --git a/lumps/genmidi/instruments/instr026-2.sbi b/lumps/genmidi/instruments/instr026-2.sbi
new file mode 100644
index 00000000..b0c02b18
Binary files /dev/null and b/lumps/genmidi/instruments/instr026-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr026.sbi b/lumps/genmidi/instruments/instr026.sbi
index f5a4c7c2..800498d8 100644
Binary files a/lumps/genmidi/instruments/instr026.sbi and b/lumps/genmidi/instruments/instr026.sbi differ
diff --git a/lumps/genmidi/instruments/instr027-2.sbi b/lumps/genmidi/instruments/instr027-2.sbi
new file mode 100644
index 00000000..12289138
Binary files /dev/null and b/lumps/genmidi/instruments/instr027-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr027.sbi b/lumps/genmidi/instruments/instr027.sbi
index ee563cc9..8ef0743e 100644
Binary files a/lumps/genmidi/instruments/instr027.sbi and b/lumps/genmidi/instruments/instr027.sbi differ
diff --git a/lumps/genmidi/instruments/instr028-2.sbi b/lumps/genmidi/instruments/instr028-2.sbi
new file mode 100644
index 00000000..22b6a5d0
Binary files /dev/null and b/lumps/genmidi/instruments/instr028-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr028.sbi b/lumps/genmidi/instruments/instr028.sbi
index 59fdc7e5..f629bceb 100644
Binary files a/lumps/genmidi/instruments/instr028.sbi and b/lumps/genmidi/instruments/instr028.sbi differ
diff --git a/lumps/genmidi/instruments/instr029-2.sbi b/lumps/genmidi/instruments/instr029-2.sbi
new file mode 100644
index 00000000..b10faad5
Binary files /dev/null and b/lumps/genmidi/instruments/instr029-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr029.sbi b/lumps/genmidi/instruments/instr029.sbi
index 2cbbb31c..852fefab 100644
Binary files a/lumps/genmidi/instruments/instr029.sbi and b/lumps/genmidi/instruments/instr029.sbi differ
diff --git a/lumps/genmidi/instruments/instr030-2.sbi b/lumps/genmidi/instruments/instr030-2.sbi
new file mode 100644
index 00000000..38051e38
Binary files /dev/null and b/lumps/genmidi/instruments/instr030-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr030.sbi b/lumps/genmidi/instruments/instr030.sbi
index 53f07431..fcf2ed18 100644
Binary files a/lumps/genmidi/instruments/instr030.sbi and b/lumps/genmidi/instruments/instr030.sbi differ
diff --git a/lumps/genmidi/instruments/instr031-2.sbi b/lumps/genmidi/instruments/instr031-2.sbi
new file mode 100644
index 00000000..be107f7c
Binary files /dev/null and b/lumps/genmidi/instruments/instr031-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr031.sbi b/lumps/genmidi/instruments/instr031.sbi
index 0ae9cc46..447cfcd5 100644
Binary files a/lumps/genmidi/instruments/instr031.sbi and b/lumps/genmidi/instruments/instr031.sbi differ
diff --git a/lumps/genmidi/instruments/instr032-2.sbi b/lumps/genmidi/instruments/instr032-2.sbi
new file mode 100644
index 00000000..3a8df2b0
Binary files /dev/null and b/lumps/genmidi/instruments/instr032-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr032.sbi b/lumps/genmidi/instruments/instr032.sbi
index bc85e66d..3266164c 100644
Binary files a/lumps/genmidi/instruments/instr032.sbi and b/lumps/genmidi/instruments/instr032.sbi differ
diff --git a/lumps/genmidi/instruments/instr033-2.sbi b/lumps/genmidi/instruments/instr033-2.sbi
new file mode 100644
index 00000000..3c1a6edd
Binary files /dev/null and b/lumps/genmidi/instruments/instr033-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr033.sbi b/lumps/genmidi/instruments/instr033.sbi
index 2968c2e2..0e760ce0 100644
Binary files a/lumps/genmidi/instruments/instr033.sbi and b/lumps/genmidi/instruments/instr033.sbi differ
diff --git a/lumps/genmidi/instruments/instr034-2.sbi b/lumps/genmidi/instruments/instr034-2.sbi
new file mode 100644
index 00000000..512158df
Binary files /dev/null and b/lumps/genmidi/instruments/instr034-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr034.sbi b/lumps/genmidi/instruments/instr034.sbi
index 44a08cb5..0572f6d9 100644
Binary files a/lumps/genmidi/instruments/instr034.sbi and b/lumps/genmidi/instruments/instr034.sbi differ
diff --git a/lumps/genmidi/instruments/instr035-2.sbi b/lumps/genmidi/instruments/instr035-2.sbi
new file mode 100644
index 00000000..a3e9688a
Binary files /dev/null and b/lumps/genmidi/instruments/instr035-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr035.sbi b/lumps/genmidi/instruments/instr035.sbi
index 72737075..1dd0350c 100644
Binary files a/lumps/genmidi/instruments/instr035.sbi and b/lumps/genmidi/instruments/instr035.sbi differ
diff --git a/lumps/genmidi/instruments/instr036-2.sbi b/lumps/genmidi/instruments/instr036-2.sbi
new file mode 100644
index 00000000..f6dc3696
Binary files /dev/null and b/lumps/genmidi/instruments/instr036-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr036.sbi b/lumps/genmidi/instruments/instr036.sbi
index 8b716108..b4223fcb 100644
Binary files a/lumps/genmidi/instruments/instr036.sbi and b/lumps/genmidi/instruments/instr036.sbi differ
diff --git a/lumps/genmidi/instruments/instr037-2.sbi b/lumps/genmidi/instruments/instr037-2.sbi
new file mode 100644
index 00000000..d0fd2a64
Binary files /dev/null and b/lumps/genmidi/instruments/instr037-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr037.sbi b/lumps/genmidi/instruments/instr037.sbi
index ea4f87f1..d677e608 100644
Binary files a/lumps/genmidi/instruments/instr037.sbi and b/lumps/genmidi/instruments/instr037.sbi differ
diff --git a/lumps/genmidi/instruments/instr038-2.sbi b/lumps/genmidi/instruments/instr038-2.sbi
new file mode 100644
index 00000000..c01c65b4
Binary files /dev/null and b/lumps/genmidi/instruments/instr038-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr038.sbi b/lumps/genmidi/instruments/instr038.sbi
index 7f5ea0ff..433dd8d9 100644
Binary files a/lumps/genmidi/instruments/instr038.sbi and b/lumps/genmidi/instruments/instr038.sbi differ
diff --git a/lumps/genmidi/instruments/instr039.sbi b/lumps/genmidi/instruments/instr039.sbi
index 3d0c38af..c79d4a63 100644
Binary files a/lumps/genmidi/instruments/instr039.sbi and b/lumps/genmidi/instruments/instr039.sbi differ
diff --git a/lumps/genmidi/instruments/instr040-2.sbi b/lumps/genmidi/instruments/instr040-2.sbi
new file mode 100644
index 00000000..29915bde
Binary files /dev/null and b/lumps/genmidi/instruments/instr040-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr040.sbi b/lumps/genmidi/instruments/instr040.sbi
index 755a91b8..29915bde 100644
Binary files a/lumps/genmidi/instruments/instr040.sbi and b/lumps/genmidi/instruments/instr040.sbi differ
diff --git a/lumps/genmidi/instruments/instr041-2.sbi b/lumps/genmidi/instruments/instr041-2.sbi
new file mode 100644
index 00000000..b1c71535
Binary files /dev/null and b/lumps/genmidi/instruments/instr041-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr041.sbi b/lumps/genmidi/instruments/instr041.sbi
index 96ff0805..32fa0e75 100644
Binary files a/lumps/genmidi/instruments/instr041.sbi and b/lumps/genmidi/instruments/instr041.sbi differ
diff --git a/lumps/genmidi/instruments/instr042.sbi b/lumps/genmidi/instruments/instr042.sbi
index f5571411..9ef181d2 100644
Binary files a/lumps/genmidi/instruments/instr042.sbi and b/lumps/genmidi/instruments/instr042.sbi differ
diff --git a/lumps/genmidi/instruments/instr043-2.sbi b/lumps/genmidi/instruments/instr043-2.sbi
new file mode 100644
index 00000000..70f1850d
Binary files /dev/null and b/lumps/genmidi/instruments/instr043-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr043.sbi b/lumps/genmidi/instruments/instr043.sbi
index f17c8edb..6be58d10 100644
Binary files a/lumps/genmidi/instruments/instr043.sbi and b/lumps/genmidi/instruments/instr043.sbi differ
diff --git a/lumps/genmidi/instruments/instr044.sbi b/lumps/genmidi/instruments/instr044.sbi
index f1e1b124..dada420c 100644
Binary files a/lumps/genmidi/instruments/instr044.sbi and b/lumps/genmidi/instruments/instr044.sbi differ
diff --git a/lumps/genmidi/instruments/instr045-2.sbi b/lumps/genmidi/instruments/instr045-2.sbi
new file mode 100644
index 00000000..4980c219
Binary files /dev/null and b/lumps/genmidi/instruments/instr045-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr045.sbi b/lumps/genmidi/instruments/instr045.sbi
index f005a687..c8f58d11 100644
Binary files a/lumps/genmidi/instruments/instr045.sbi and b/lumps/genmidi/instruments/instr045.sbi differ
diff --git a/lumps/genmidi/instruments/instr046-2.sbi b/lumps/genmidi/instruments/instr046-2.sbi
new file mode 100644
index 00000000..98a3e10f
Binary files /dev/null and b/lumps/genmidi/instruments/instr046-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr046.sbi b/lumps/genmidi/instruments/instr046.sbi
index d7e20c6a..a72b5cf5 100644
Binary files a/lumps/genmidi/instruments/instr046.sbi and b/lumps/genmidi/instruments/instr046.sbi differ
diff --git a/lumps/genmidi/instruments/instr047-2.sbi b/lumps/genmidi/instruments/instr047-2.sbi
new file mode 100644
index 00000000..3ad6787d
Binary files /dev/null and b/lumps/genmidi/instruments/instr047-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr047.sbi b/lumps/genmidi/instruments/instr047.sbi
index d26f09e9..53c41bd8 100644
Binary files a/lumps/genmidi/instruments/instr047.sbi and b/lumps/genmidi/instruments/instr047.sbi differ
diff --git a/lumps/genmidi/instruments/instr048-2.sbi b/lumps/genmidi/instruments/instr048-2.sbi
new file mode 100644
index 00000000..7a0df67f
Binary files /dev/null and b/lumps/genmidi/instruments/instr048-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr048.sbi b/lumps/genmidi/instruments/instr048.sbi
index 861c2768..c610c46c 100644
Binary files a/lumps/genmidi/instruments/instr048.sbi and b/lumps/genmidi/instruments/instr048.sbi differ
diff --git a/lumps/genmidi/instruments/instr049-2.sbi b/lumps/genmidi/instruments/instr049-2.sbi
new file mode 100644
index 00000000..253b9695
Binary files /dev/null and b/lumps/genmidi/instruments/instr049-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr049.sbi b/lumps/genmidi/instruments/instr049.sbi
index 7ee50249..f1b7d0bf 100644
Binary files a/lumps/genmidi/instruments/instr049.sbi and b/lumps/genmidi/instruments/instr049.sbi differ
diff --git a/lumps/genmidi/instruments/instr050-2.sbi b/lumps/genmidi/instruments/instr050-2.sbi
new file mode 100644
index 00000000..1fda329d
Binary files /dev/null and b/lumps/genmidi/instruments/instr050-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr050.sbi b/lumps/genmidi/instruments/instr050.sbi
index d1e3f90d..55f9e2cb 100644
Binary files a/lumps/genmidi/instruments/instr050.sbi and b/lumps/genmidi/instruments/instr050.sbi differ
diff --git a/lumps/genmidi/instruments/instr051-2.sbi b/lumps/genmidi/instruments/instr051-2.sbi
new file mode 100644
index 00000000..cddad3c2
Binary files /dev/null and b/lumps/genmidi/instruments/instr051-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr051.sbi b/lumps/genmidi/instruments/instr051.sbi
index bde30318..cd14097a 100644
Binary files a/lumps/genmidi/instruments/instr051.sbi and b/lumps/genmidi/instruments/instr051.sbi differ
diff --git a/lumps/genmidi/instruments/instr052-2.sbi b/lumps/genmidi/instruments/instr052-2.sbi
new file mode 100644
index 00000000..c6c450a3
Binary files /dev/null and b/lumps/genmidi/instruments/instr052-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr052.sbi b/lumps/genmidi/instruments/instr052.sbi
index 94ab52cc..7f823cc5 100644
Binary files a/lumps/genmidi/instruments/instr052.sbi and b/lumps/genmidi/instruments/instr052.sbi differ
diff --git a/lumps/genmidi/instruments/instr053-2.sbi b/lumps/genmidi/instruments/instr053-2.sbi
new file mode 100644
index 00000000..567f7947
Binary files /dev/null and b/lumps/genmidi/instruments/instr053-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr053.sbi b/lumps/genmidi/instruments/instr053.sbi
index 93920b34..e106ff33 100644
Binary files a/lumps/genmidi/instruments/instr053.sbi and b/lumps/genmidi/instruments/instr053.sbi differ
diff --git a/lumps/genmidi/instruments/instr054-2.sbi b/lumps/genmidi/instruments/instr054-2.sbi
new file mode 100644
index 00000000..5eb554f8
Binary files /dev/null and b/lumps/genmidi/instruments/instr054-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr054.sbi b/lumps/genmidi/instruments/instr054.sbi
index 3ae413aa..753bd05d 100644
Binary files a/lumps/genmidi/instruments/instr054.sbi and b/lumps/genmidi/instruments/instr054.sbi differ
diff --git a/lumps/genmidi/instruments/instr055-2.sbi b/lumps/genmidi/instruments/instr055-2.sbi
new file mode 100644
index 00000000..cf45a744
Binary files /dev/null and b/lumps/genmidi/instruments/instr055-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr055.sbi b/lumps/genmidi/instruments/instr055.sbi
index c96a3dba..52719ce1 100644
Binary files a/lumps/genmidi/instruments/instr055.sbi and b/lumps/genmidi/instruments/instr055.sbi differ
diff --git a/lumps/genmidi/instruments/instr056-2.sbi b/lumps/genmidi/instruments/instr056-2.sbi
new file mode 100644
index 00000000..1e87dd78
Binary files /dev/null and b/lumps/genmidi/instruments/instr056-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr056.sbi b/lumps/genmidi/instruments/instr056.sbi
index d393f014..e6a7ca3f 100644
Binary files a/lumps/genmidi/instruments/instr056.sbi and b/lumps/genmidi/instruments/instr056.sbi differ
diff --git a/lumps/genmidi/instruments/instr057.sbi b/lumps/genmidi/instruments/instr057.sbi
index a2710364..f9b39146 100644
Binary files a/lumps/genmidi/instruments/instr057.sbi and b/lumps/genmidi/instruments/instr057.sbi differ
diff --git a/lumps/genmidi/instruments/instr058-2.sbi b/lumps/genmidi/instruments/instr058-2.sbi
new file mode 100644
index 00000000..5ebc8df9
Binary files /dev/null and b/lumps/genmidi/instruments/instr058-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr058.sbi b/lumps/genmidi/instruments/instr058.sbi
index 83525e1f..ad7fa2a6 100644
Binary files a/lumps/genmidi/instruments/instr058.sbi and b/lumps/genmidi/instruments/instr058.sbi differ
diff --git a/lumps/genmidi/instruments/instr059.sbi b/lumps/genmidi/instruments/instr059.sbi
index f4de1e30..0398765f 100644
Binary files a/lumps/genmidi/instruments/instr059.sbi and b/lumps/genmidi/instruments/instr059.sbi differ
diff --git a/lumps/genmidi/instruments/instr060.sbi b/lumps/genmidi/instruments/instr060.sbi
index 0d4d0d25..3f436d17 100644
Binary files a/lumps/genmidi/instruments/instr060.sbi and b/lumps/genmidi/instruments/instr060.sbi differ
diff --git a/lumps/genmidi/instruments/instr061-2.sbi b/lumps/genmidi/instruments/instr061-2.sbi
new file mode 100644
index 00000000..56210de7
Binary files /dev/null and b/lumps/genmidi/instruments/instr061-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr061.sbi b/lumps/genmidi/instruments/instr061.sbi
index fa046c06..5f6834c1 100644
Binary files a/lumps/genmidi/instruments/instr061.sbi and b/lumps/genmidi/instruments/instr061.sbi differ
diff --git a/lumps/genmidi/instruments/instr062-2.sbi b/lumps/genmidi/instruments/instr062-2.sbi
new file mode 100644
index 00000000..3bad0f0f
Binary files /dev/null and b/lumps/genmidi/instruments/instr062-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr062.sbi b/lumps/genmidi/instruments/instr062.sbi
index 44b88cc8..fbb23343 100644
Binary files a/lumps/genmidi/instruments/instr062.sbi and b/lumps/genmidi/instruments/instr062.sbi differ
diff --git a/lumps/genmidi/instruments/instr063-2.sbi b/lumps/genmidi/instruments/instr063-2.sbi
new file mode 100644
index 00000000..128692f3
Binary files /dev/null and b/lumps/genmidi/instruments/instr063-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr063.sbi b/lumps/genmidi/instruments/instr063.sbi
index 04b2714b..d2fd901b 100644
Binary files a/lumps/genmidi/instruments/instr063.sbi and b/lumps/genmidi/instruments/instr063.sbi differ
diff --git a/lumps/genmidi/instruments/instr064-2.sbi b/lumps/genmidi/instruments/instr064-2.sbi
new file mode 100644
index 00000000..abd6c9dd
Binary files /dev/null and b/lumps/genmidi/instruments/instr064-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr064.sbi b/lumps/genmidi/instruments/instr064.sbi
index 2abb86da..abd6c9dd 100644
Binary files a/lumps/genmidi/instruments/instr064.sbi and b/lumps/genmidi/instruments/instr064.sbi differ
diff --git a/lumps/genmidi/instruments/instr065.sbi b/lumps/genmidi/instruments/instr065.sbi
index 315c3fb7..57f5d2b8 100644
Binary files a/lumps/genmidi/instruments/instr065.sbi and b/lumps/genmidi/instruments/instr065.sbi differ
diff --git a/lumps/genmidi/instruments/instr066.sbi b/lumps/genmidi/instruments/instr066.sbi
index f2465702..865128f2 100644
Binary files a/lumps/genmidi/instruments/instr066.sbi and b/lumps/genmidi/instruments/instr066.sbi differ
diff --git a/lumps/genmidi/instruments/instr067.sbi b/lumps/genmidi/instruments/instr067.sbi
index 30a6798b..e7540ca3 100644
Binary files a/lumps/genmidi/instruments/instr067.sbi and b/lumps/genmidi/instruments/instr067.sbi differ
diff --git a/lumps/genmidi/instruments/instr068.sbi b/lumps/genmidi/instruments/instr068.sbi
index 74ac22b1..31246abf 100644
Binary files a/lumps/genmidi/instruments/instr068.sbi and b/lumps/genmidi/instruments/instr068.sbi differ
diff --git a/lumps/genmidi/instruments/instr069-2.sbi b/lumps/genmidi/instruments/instr069-2.sbi
new file mode 100644
index 00000000..94adf79b
Binary files /dev/null and b/lumps/genmidi/instruments/instr069-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr069.sbi b/lumps/genmidi/instruments/instr069.sbi
index 59afd324..5c8d32e8 100644
Binary files a/lumps/genmidi/instruments/instr069.sbi and b/lumps/genmidi/instruments/instr069.sbi differ
diff --git a/lumps/genmidi/instruments/instr070.sbi b/lumps/genmidi/instruments/instr070.sbi
index 06acd051..74a755ff 100644
Binary files a/lumps/genmidi/instruments/instr070.sbi and b/lumps/genmidi/instruments/instr070.sbi differ
diff --git a/lumps/genmidi/instruments/instr071.sbi b/lumps/genmidi/instruments/instr071.sbi
index 479a1bab..a8b5b694 100644
Binary files a/lumps/genmidi/instruments/instr071.sbi and b/lumps/genmidi/instruments/instr071.sbi differ
diff --git a/lumps/genmidi/instruments/instr072.sbi b/lumps/genmidi/instruments/instr072.sbi
index f16b7754..31d280d5 100644
Binary files a/lumps/genmidi/instruments/instr072.sbi and b/lumps/genmidi/instruments/instr072.sbi differ
diff --git a/lumps/genmidi/instruments/instr073.sbi b/lumps/genmidi/instruments/instr073.sbi
index 06126544..1c08ea3e 100644
Binary files a/lumps/genmidi/instruments/instr073.sbi and b/lumps/genmidi/instruments/instr073.sbi differ
diff --git a/lumps/genmidi/instruments/instr074.sbi b/lumps/genmidi/instruments/instr074.sbi
index 181edcaf..809106d7 100644
Binary files a/lumps/genmidi/instruments/instr074.sbi and b/lumps/genmidi/instruments/instr074.sbi differ
diff --git a/lumps/genmidi/instruments/instr075.sbi b/lumps/genmidi/instruments/instr075.sbi
index 36a7df79..0eb63af6 100644
Binary files a/lumps/genmidi/instruments/instr075.sbi and b/lumps/genmidi/instruments/instr075.sbi differ
diff --git a/lumps/genmidi/instruments/instr076-2.sbi b/lumps/genmidi/instruments/instr076-2.sbi
new file mode 100644
index 00000000..dcc50efb
Binary files /dev/null and b/lumps/genmidi/instruments/instr076-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr076.sbi b/lumps/genmidi/instruments/instr076.sbi
index abc257b0..132a23e0 100644
Binary files a/lumps/genmidi/instruments/instr076.sbi and b/lumps/genmidi/instruments/instr076.sbi differ
diff --git a/lumps/genmidi/instruments/instr077-2.sbi b/lumps/genmidi/instruments/instr077-2.sbi
new file mode 100644
index 00000000..697aef3e
Binary files /dev/null and b/lumps/genmidi/instruments/instr077-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr077.sbi b/lumps/genmidi/instruments/instr077.sbi
index e8127455..8f916ea0 100644
Binary files a/lumps/genmidi/instruments/instr077.sbi and b/lumps/genmidi/instruments/instr077.sbi differ
diff --git a/lumps/genmidi/instruments/instr078-2.sbi b/lumps/genmidi/instruments/instr078-2.sbi
new file mode 100644
index 00000000..25614fe8
Binary files /dev/null and b/lumps/genmidi/instruments/instr078-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr078.sbi b/lumps/genmidi/instruments/instr078.sbi
index dde250b5..0ac5c401 100644
Binary files a/lumps/genmidi/instruments/instr078.sbi and b/lumps/genmidi/instruments/instr078.sbi differ
diff --git a/lumps/genmidi/instruments/instr079.sbi b/lumps/genmidi/instruments/instr079.sbi
index 4fcb0f88..a9705c60 100644
Binary files a/lumps/genmidi/instruments/instr079.sbi and b/lumps/genmidi/instruments/instr079.sbi differ
diff --git a/lumps/genmidi/instruments/instr080.sbi b/lumps/genmidi/instruments/instr080.sbi
index 1c569689..e636e82c 100644
Binary files a/lumps/genmidi/instruments/instr080.sbi and b/lumps/genmidi/instruments/instr080.sbi differ
diff --git a/lumps/genmidi/instruments/instr081-2.sbi b/lumps/genmidi/instruments/instr081-2.sbi
new file mode 100644
index 00000000..2f762cad
Binary files /dev/null and b/lumps/genmidi/instruments/instr081-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr081.sbi b/lumps/genmidi/instruments/instr081.sbi
index cec7fde2..701a1a6d 100644
Binary files a/lumps/genmidi/instruments/instr081.sbi and b/lumps/genmidi/instruments/instr081.sbi differ
diff --git a/lumps/genmidi/instruments/instr082-2.sbi b/lumps/genmidi/instruments/instr082-2.sbi
new file mode 100644
index 00000000..d61da550
Binary files /dev/null and b/lumps/genmidi/instruments/instr082-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr082.sbi b/lumps/genmidi/instruments/instr082.sbi
index d363af77..7d3acd5c 100644
Binary files a/lumps/genmidi/instruments/instr082.sbi and b/lumps/genmidi/instruments/instr082.sbi differ
diff --git a/lumps/genmidi/instruments/instr083-2.sbi b/lumps/genmidi/instruments/instr083-2.sbi
new file mode 100644
index 00000000..7d12a974
Binary files /dev/null and b/lumps/genmidi/instruments/instr083-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr083.sbi b/lumps/genmidi/instruments/instr083.sbi
index 70112736..b91a3c4a 100644
Binary files a/lumps/genmidi/instruments/instr083.sbi and b/lumps/genmidi/instruments/instr083.sbi differ
diff --git a/lumps/genmidi/instruments/instr084-2.sbi b/lumps/genmidi/instruments/instr084-2.sbi
new file mode 100644
index 00000000..04c05464
Binary files /dev/null and b/lumps/genmidi/instruments/instr084-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr084.sbi b/lumps/genmidi/instruments/instr084.sbi
index 07a9d56c..a8a76182 100644
Binary files a/lumps/genmidi/instruments/instr084.sbi and b/lumps/genmidi/instruments/instr084.sbi differ
diff --git a/lumps/genmidi/instruments/instr085.sbi b/lumps/genmidi/instruments/instr085.sbi
index ca30ae7c..544356e1 100644
Binary files a/lumps/genmidi/instruments/instr085.sbi and b/lumps/genmidi/instruments/instr085.sbi differ
diff --git a/lumps/genmidi/instruments/instr086-2.sbi b/lumps/genmidi/instruments/instr086-2.sbi
new file mode 100644
index 00000000..62e11788
Binary files /dev/null and b/lumps/genmidi/instruments/instr086-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr086.sbi b/lumps/genmidi/instruments/instr086.sbi
index 85561dda..83c39c21 100644
Binary files a/lumps/genmidi/instruments/instr086.sbi and b/lumps/genmidi/instruments/instr086.sbi differ
diff --git a/lumps/genmidi/instruments/instr087-2.sbi b/lumps/genmidi/instruments/instr087-2.sbi
new file mode 100644
index 00000000..aa32bb6e
Binary files /dev/null and b/lumps/genmidi/instruments/instr087-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr087.sbi b/lumps/genmidi/instruments/instr087.sbi
index f3730b8c..801bc7f9 100644
Binary files a/lumps/genmidi/instruments/instr087.sbi and b/lumps/genmidi/instruments/instr087.sbi differ
diff --git a/lumps/genmidi/instruments/instr088-2.sbi b/lumps/genmidi/instruments/instr088-2.sbi
new file mode 100644
index 00000000..3d85053e
Binary files /dev/null and b/lumps/genmidi/instruments/instr088-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr088.sbi b/lumps/genmidi/instruments/instr088.sbi
index eb9a460f..357e7535 100644
Binary files a/lumps/genmidi/instruments/instr088.sbi and b/lumps/genmidi/instruments/instr088.sbi differ
diff --git a/lumps/genmidi/instruments/instr089-2.sbi b/lumps/genmidi/instruments/instr089-2.sbi
new file mode 100644
index 00000000..2edd35ec
Binary files /dev/null and b/lumps/genmidi/instruments/instr089-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr089.sbi b/lumps/genmidi/instruments/instr089.sbi
index 9d66d9a3..7a4797af 100644
Binary files a/lumps/genmidi/instruments/instr089.sbi and b/lumps/genmidi/instruments/instr089.sbi differ
diff --git a/lumps/genmidi/instruments/instr090-2.sbi b/lumps/genmidi/instruments/instr090-2.sbi
new file mode 100644
index 00000000..67a25a48
Binary files /dev/null and b/lumps/genmidi/instruments/instr090-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr090.sbi b/lumps/genmidi/instruments/instr090.sbi
index 39ae87d3..b62e8271 100644
Binary files a/lumps/genmidi/instruments/instr090.sbi and b/lumps/genmidi/instruments/instr090.sbi differ
diff --git a/lumps/genmidi/instruments/instr091-2.sbi b/lumps/genmidi/instruments/instr091-2.sbi
new file mode 100644
index 00000000..12b0b928
Binary files /dev/null and b/lumps/genmidi/instruments/instr091-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr091.sbi b/lumps/genmidi/instruments/instr091.sbi
index 48764f1b..3e96677c 100644
Binary files a/lumps/genmidi/instruments/instr091.sbi and b/lumps/genmidi/instruments/instr091.sbi differ
diff --git a/lumps/genmidi/instruments/instr092-2.sbi b/lumps/genmidi/instruments/instr092-2.sbi
new file mode 100644
index 00000000..9b637cc8
Binary files /dev/null and b/lumps/genmidi/instruments/instr092-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr092.sbi b/lumps/genmidi/instruments/instr092.sbi
index 9af66a75..8595e2e8 100644
Binary files a/lumps/genmidi/instruments/instr092.sbi and b/lumps/genmidi/instruments/instr092.sbi differ
diff --git a/lumps/genmidi/instruments/instr093-2.sbi b/lumps/genmidi/instruments/instr093-2.sbi
new file mode 100644
index 00000000..0200e33c
Binary files /dev/null and b/lumps/genmidi/instruments/instr093-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr093.sbi b/lumps/genmidi/instruments/instr093.sbi
index 3ec6d108..ec120297 100644
Binary files a/lumps/genmidi/instruments/instr093.sbi and b/lumps/genmidi/instruments/instr093.sbi differ
diff --git a/lumps/genmidi/instruments/instr094-2.sbi b/lumps/genmidi/instruments/instr094-2.sbi
new file mode 100644
index 00000000..436259ae
Binary files /dev/null and b/lumps/genmidi/instruments/instr094-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr094.sbi b/lumps/genmidi/instruments/instr094.sbi
index 7272dcec..6a2cbfe1 100644
Binary files a/lumps/genmidi/instruments/instr094.sbi and b/lumps/genmidi/instruments/instr094.sbi differ
diff --git a/lumps/genmidi/instruments/instr095-2.sbi b/lumps/genmidi/instruments/instr095-2.sbi
new file mode 100644
index 00000000..a084f5fa
Binary files /dev/null and b/lumps/genmidi/instruments/instr095-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr095.sbi b/lumps/genmidi/instruments/instr095.sbi
index a8917b5d..1a171226 100644
Binary files a/lumps/genmidi/instruments/instr095.sbi and b/lumps/genmidi/instruments/instr095.sbi differ
diff --git a/lumps/genmidi/instruments/instr096-2.sbi b/lumps/genmidi/instruments/instr096-2.sbi
new file mode 100644
index 00000000..56c4df75
Binary files /dev/null and b/lumps/genmidi/instruments/instr096-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr096.sbi b/lumps/genmidi/instruments/instr096.sbi
index b52a70e5..7bffbe62 100644
Binary files a/lumps/genmidi/instruments/instr096.sbi and b/lumps/genmidi/instruments/instr096.sbi differ
diff --git a/lumps/genmidi/instruments/instr097-2.sbi b/lumps/genmidi/instruments/instr097-2.sbi
new file mode 100644
index 00000000..ef509f78
Binary files /dev/null and b/lumps/genmidi/instruments/instr097-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr097.sbi b/lumps/genmidi/instruments/instr097.sbi
index bb802e06..70f7ca51 100644
Binary files a/lumps/genmidi/instruments/instr097.sbi and b/lumps/genmidi/instruments/instr097.sbi differ
diff --git a/lumps/genmidi/instruments/instr098-2.sbi b/lumps/genmidi/instruments/instr098-2.sbi
new file mode 100644
index 00000000..47fc0d47
Binary files /dev/null and b/lumps/genmidi/instruments/instr098-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr098.sbi b/lumps/genmidi/instruments/instr098.sbi
index 25fa9f76..4fcc64fc 100644
Binary files a/lumps/genmidi/instruments/instr098.sbi and b/lumps/genmidi/instruments/instr098.sbi differ
diff --git a/lumps/genmidi/instruments/instr099-2.sbi b/lumps/genmidi/instruments/instr099-2.sbi
new file mode 100644
index 00000000..af9c1924
Binary files /dev/null and b/lumps/genmidi/instruments/instr099-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr099.sbi b/lumps/genmidi/instruments/instr099.sbi
index 57ed6bec..af9c1924 100644
Binary files a/lumps/genmidi/instruments/instr099.sbi and b/lumps/genmidi/instruments/instr099.sbi differ
diff --git a/lumps/genmidi/instruments/instr100-2.sbi b/lumps/genmidi/instruments/instr100-2.sbi
new file mode 100644
index 00000000..cbfbb416
Binary files /dev/null and b/lumps/genmidi/instruments/instr100-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr100.sbi b/lumps/genmidi/instruments/instr100.sbi
index 04e37f8d..95c294be 100644
Binary files a/lumps/genmidi/instruments/instr100.sbi and b/lumps/genmidi/instruments/instr100.sbi differ
diff --git a/lumps/genmidi/instruments/instr101-2.sbi b/lumps/genmidi/instruments/instr101-2.sbi
new file mode 100644
index 00000000..63d0213f
Binary files /dev/null and b/lumps/genmidi/instruments/instr101-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr101.sbi b/lumps/genmidi/instruments/instr101.sbi
index 5bc4871e..e7fc5289 100644
Binary files a/lumps/genmidi/instruments/instr101.sbi and b/lumps/genmidi/instruments/instr101.sbi differ
diff --git a/lumps/genmidi/instruments/instr102-2.sbi b/lumps/genmidi/instruments/instr102-2.sbi
new file mode 100644
index 00000000..6af3e66f
Binary files /dev/null and b/lumps/genmidi/instruments/instr102-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr102.sbi b/lumps/genmidi/instruments/instr102.sbi
index 2e0fa608..0052f100 100644
Binary files a/lumps/genmidi/instruments/instr102.sbi and b/lumps/genmidi/instruments/instr102.sbi differ
diff --git a/lumps/genmidi/instruments/instr103-2.sbi b/lumps/genmidi/instruments/instr103-2.sbi
new file mode 100644
index 00000000..21543c44
Binary files /dev/null and b/lumps/genmidi/instruments/instr103-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr103.sbi b/lumps/genmidi/instruments/instr103.sbi
index d9f29501..5cd43294 100644
Binary files a/lumps/genmidi/instruments/instr103.sbi and b/lumps/genmidi/instruments/instr103.sbi differ
diff --git a/lumps/genmidi/instruments/instr104-2.sbi b/lumps/genmidi/instruments/instr104-2.sbi
new file mode 100644
index 00000000..6d229ebe
Binary files /dev/null and b/lumps/genmidi/instruments/instr104-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr104.sbi b/lumps/genmidi/instruments/instr104.sbi
index 2a103e65..8d626ce8 100644
Binary files a/lumps/genmidi/instruments/instr104.sbi and b/lumps/genmidi/instruments/instr104.sbi differ
diff --git a/lumps/genmidi/instruments/instr105-2.sbi b/lumps/genmidi/instruments/instr105-2.sbi
new file mode 100644
index 00000000..f4f4c3e3
Binary files /dev/null and b/lumps/genmidi/instruments/instr105-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr105.sbi b/lumps/genmidi/instruments/instr105.sbi
index 8c16b0d9..3f6d67a1 100644
Binary files a/lumps/genmidi/instruments/instr105.sbi and b/lumps/genmidi/instruments/instr105.sbi differ
diff --git a/lumps/genmidi/instruments/instr106-2.sbi b/lumps/genmidi/instruments/instr106-2.sbi
new file mode 100644
index 00000000..b02558db
Binary files /dev/null and b/lumps/genmidi/instruments/instr106-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr106.sbi b/lumps/genmidi/instruments/instr106.sbi
index 81e37079..6acc642f 100644
Binary files a/lumps/genmidi/instruments/instr106.sbi and b/lumps/genmidi/instruments/instr106.sbi differ
diff --git a/lumps/genmidi/instruments/instr108.sbi b/lumps/genmidi/instruments/instr108.sbi
index 693e7e6f..b84b510a 100644
Binary files a/lumps/genmidi/instruments/instr108.sbi and b/lumps/genmidi/instruments/instr108.sbi differ
diff --git a/lumps/genmidi/instruments/instr109.sbi b/lumps/genmidi/instruments/instr109.sbi
index 70883534..1fc2488e 100644
Binary files a/lumps/genmidi/instruments/instr109.sbi and b/lumps/genmidi/instruments/instr109.sbi differ
diff --git a/lumps/genmidi/instruments/instr110-2.sbi b/lumps/genmidi/instruments/instr110-2.sbi
new file mode 100644
index 00000000..1d6f4bb3
Binary files /dev/null and b/lumps/genmidi/instruments/instr110-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr110.sbi b/lumps/genmidi/instruments/instr110.sbi
index ad2be631..05b81bd1 100644
Binary files a/lumps/genmidi/instruments/instr110.sbi and b/lumps/genmidi/instruments/instr110.sbi differ
diff --git a/lumps/genmidi/instruments/instr111.sbi b/lumps/genmidi/instruments/instr111.sbi
index 75b3f34d..5b85dfd6 100644
Binary files a/lumps/genmidi/instruments/instr111.sbi and b/lumps/genmidi/instruments/instr111.sbi differ
diff --git a/lumps/genmidi/instruments/instr112.sbi b/lumps/genmidi/instruments/instr112.sbi
index 667c2f5b..bb101744 100644
Binary files a/lumps/genmidi/instruments/instr112.sbi and b/lumps/genmidi/instruments/instr112.sbi differ
diff --git a/lumps/genmidi/instruments/instr113.sbi b/lumps/genmidi/instruments/instr113.sbi
index f4c676b8..d36d7fa6 100644
Binary files a/lumps/genmidi/instruments/instr113.sbi and b/lumps/genmidi/instruments/instr113.sbi differ
diff --git a/lumps/genmidi/instruments/instr114.sbi b/lumps/genmidi/instruments/instr114.sbi
index f14166ca..5b4ca4f4 100644
Binary files a/lumps/genmidi/instruments/instr114.sbi and b/lumps/genmidi/instruments/instr114.sbi differ
diff --git a/lumps/genmidi/instruments/instr115-2.sbi b/lumps/genmidi/instruments/instr115-2.sbi
new file mode 100644
index 00000000..1fced2cf
Binary files /dev/null and b/lumps/genmidi/instruments/instr115-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr115.sbi b/lumps/genmidi/instruments/instr115.sbi
index 1a502395..b2aa4455 100644
Binary files a/lumps/genmidi/instruments/instr115.sbi and b/lumps/genmidi/instruments/instr115.sbi differ
diff --git a/lumps/genmidi/instruments/instr116.sbi b/lumps/genmidi/instruments/instr116.sbi
index ac89619c..fe3b6a46 100644
Binary files a/lumps/genmidi/instruments/instr116.sbi and b/lumps/genmidi/instruments/instr116.sbi differ
diff --git a/lumps/genmidi/instruments/instr117-2.sbi b/lumps/genmidi/instruments/instr117-2.sbi
new file mode 100644
index 00000000..e48ab377
Binary files /dev/null and b/lumps/genmidi/instruments/instr117-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr117.sbi b/lumps/genmidi/instruments/instr117.sbi
index 1fe08f94..dd6582d2 100644
Binary files a/lumps/genmidi/instruments/instr117.sbi and b/lumps/genmidi/instruments/instr117.sbi differ
diff --git a/lumps/genmidi/instruments/instr118-2.sbi b/lumps/genmidi/instruments/instr118-2.sbi
new file mode 100644
index 00000000..2ec024d1
Binary files /dev/null and b/lumps/genmidi/instruments/instr118-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr118.sbi b/lumps/genmidi/instruments/instr118.sbi
index 80f81c03..1e5859b7 100644
Binary files a/lumps/genmidi/instruments/instr118.sbi and b/lumps/genmidi/instruments/instr118.sbi differ
diff --git a/lumps/genmidi/instruments/instr119-2.sbi b/lumps/genmidi/instruments/instr119-2.sbi
new file mode 100644
index 00000000..04977786
Binary files /dev/null and b/lumps/genmidi/instruments/instr119-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr119.sbi b/lumps/genmidi/instruments/instr119.sbi
index 6c9f26eb..9150e826 100644
Binary files a/lumps/genmidi/instruments/instr119.sbi and b/lumps/genmidi/instruments/instr119.sbi differ
diff --git a/lumps/genmidi/instruments/instr120-2.sbi b/lumps/genmidi/instruments/instr120-2.sbi
new file mode 100644
index 00000000..a3492833
Binary files /dev/null and b/lumps/genmidi/instruments/instr120-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr120.sbi b/lumps/genmidi/instruments/instr120.sbi
index 8ff2ff67..b3936041 100644
Binary files a/lumps/genmidi/instruments/instr120.sbi and b/lumps/genmidi/instruments/instr120.sbi differ
diff --git a/lumps/genmidi/instruments/instr121.sbi b/lumps/genmidi/instruments/instr121.sbi
index 249b8c26..fcc221ec 100644
Binary files a/lumps/genmidi/instruments/instr121.sbi and b/lumps/genmidi/instruments/instr121.sbi differ
diff --git a/lumps/genmidi/instruments/instr122-2.sbi b/lumps/genmidi/instruments/instr122-2.sbi
new file mode 100644
index 00000000..27ebefd4
Binary files /dev/null and b/lumps/genmidi/instruments/instr122-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr122.sbi b/lumps/genmidi/instruments/instr122.sbi
index 367167f6..22ccdad5 100644
Binary files a/lumps/genmidi/instruments/instr122.sbi and b/lumps/genmidi/instruments/instr122.sbi differ
diff --git a/lumps/genmidi/instruments/instr123-2.sbi b/lumps/genmidi/instruments/instr123-2.sbi
new file mode 100644
index 00000000..877a4ca2
Binary files /dev/null and b/lumps/genmidi/instruments/instr123-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr123.sbi b/lumps/genmidi/instruments/instr123.sbi
index dbfabdea..3b280f97 100644
Binary files a/lumps/genmidi/instruments/instr123.sbi and b/lumps/genmidi/instruments/instr123.sbi differ
diff --git a/lumps/genmidi/instruments/instr124.sbi b/lumps/genmidi/instruments/instr124.sbi
index 8c688baa..b9d5bffb 100644
Binary files a/lumps/genmidi/instruments/instr124.sbi and b/lumps/genmidi/instruments/instr124.sbi differ
diff --git a/lumps/genmidi/instruments/instr125-2.sbi b/lumps/genmidi/instruments/instr125-2.sbi
new file mode 100644
index 00000000..7b682ce1
Binary files /dev/null and b/lumps/genmidi/instruments/instr125-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr125.sbi b/lumps/genmidi/instruments/instr125.sbi
index e144454d..c504d760 100644
Binary files a/lumps/genmidi/instruments/instr125.sbi and b/lumps/genmidi/instruments/instr125.sbi differ
diff --git a/lumps/genmidi/instruments/instr126-2.sbi b/lumps/genmidi/instruments/instr126-2.sbi
new file mode 100644
index 00000000..7064349e
Binary files /dev/null and b/lumps/genmidi/instruments/instr126-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr126.sbi b/lumps/genmidi/instruments/instr126.sbi
index a1c0ba0c..e95c1f34 100644
Binary files a/lumps/genmidi/instruments/instr126.sbi and b/lumps/genmidi/instruments/instr126.sbi differ
diff --git a/lumps/genmidi/instruments/instr127-2.sbi b/lumps/genmidi/instruments/instr127-2.sbi
new file mode 100644
index 00000000..370b0a29
Binary files /dev/null and b/lumps/genmidi/instruments/instr127-2.sbi differ
diff --git a/lumps/genmidi/instruments/instr127.sbi b/lumps/genmidi/instruments/instr127.sbi
index c2de3633..370b0a29 100644
Binary files a/lumps/genmidi/instruments/instr127.sbi and b/lumps/genmidi/instruments/instr127.sbi differ
diff --git a/lumps/genmidi/instruments/instr128.sbi b/lumps/genmidi/instruments/instr128.sbi
index 75042686..ad442e91 100644
Binary files a/lumps/genmidi/instruments/instr128.sbi and b/lumps/genmidi/instruments/instr128.sbi differ
diff --git a/lumps/genmidi/instruments/perc35.sbi b/lumps/genmidi/instruments/perc35.sbi
index edf0e474..8820e35b 100644
Binary files a/lumps/genmidi/instruments/perc35.sbi and b/lumps/genmidi/instruments/perc35.sbi differ
diff --git a/lumps/genmidi/instruments/perc37-2.sbi b/lumps/genmidi/instruments/perc37-2.sbi
new file mode 100644
index 00000000..d1f81030
Binary files /dev/null and b/lumps/genmidi/instruments/perc37-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc37.sbi b/lumps/genmidi/instruments/perc37.sbi
index 56e3d3de..3b09afd3 100644
Binary files a/lumps/genmidi/instruments/perc37.sbi and b/lumps/genmidi/instruments/perc37.sbi differ
diff --git a/lumps/genmidi/instruments/perc38-2.sbi b/lumps/genmidi/instruments/perc38-2.sbi
new file mode 100644
index 00000000..70cea458
Binary files /dev/null and b/lumps/genmidi/instruments/perc38-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc38.sbi b/lumps/genmidi/instruments/perc38.sbi
index 1d62e339..5c39c85a 100644
Binary files a/lumps/genmidi/instruments/perc38.sbi and b/lumps/genmidi/instruments/perc38.sbi differ
diff --git a/lumps/genmidi/instruments/perc39-2.sbi b/lumps/genmidi/instruments/perc39-2.sbi
new file mode 100644
index 00000000..d5918c8f
Binary files /dev/null and b/lumps/genmidi/instruments/perc39-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc39.sbi b/lumps/genmidi/instruments/perc39.sbi
index 79f71e22..6cdbdd57 100644
Binary files a/lumps/genmidi/instruments/perc39.sbi and b/lumps/genmidi/instruments/perc39.sbi differ
diff --git a/lumps/genmidi/instruments/perc40-2.sbi b/lumps/genmidi/instruments/perc40-2.sbi
new file mode 100644
index 00000000..61a4ace2
Binary files /dev/null and b/lumps/genmidi/instruments/perc40-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc40.sbi b/lumps/genmidi/instruments/perc40.sbi
index d89aa7ce..b046c23a 100644
Binary files a/lumps/genmidi/instruments/perc40.sbi and b/lumps/genmidi/instruments/perc40.sbi differ
diff --git a/lumps/genmidi/instruments/perc41.sbi b/lumps/genmidi/instruments/perc41.sbi
index d7f3603a..bd5dc636 100644
Binary files a/lumps/genmidi/instruments/perc41.sbi and b/lumps/genmidi/instruments/perc41.sbi differ
diff --git a/lumps/genmidi/instruments/perc42-2.sbi b/lumps/genmidi/instruments/perc42-2.sbi
new file mode 100644
index 00000000..1f1308ef
Binary files /dev/null and b/lumps/genmidi/instruments/perc42-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc42.sbi b/lumps/genmidi/instruments/perc42.sbi
index 39252b5a..7aeb19df 100644
Binary files a/lumps/genmidi/instruments/perc42.sbi and b/lumps/genmidi/instruments/perc42.sbi differ
diff --git a/lumps/genmidi/instruments/perc43.sbi b/lumps/genmidi/instruments/perc43.sbi
index 9c5bafb5..eba86394 100644
Binary files a/lumps/genmidi/instruments/perc43.sbi and b/lumps/genmidi/instruments/perc43.sbi differ
diff --git a/lumps/genmidi/instruments/perc44.sbi b/lumps/genmidi/instruments/perc44.sbi
index 7adceb92..958b90da 100644
Binary files a/lumps/genmidi/instruments/perc44.sbi and b/lumps/genmidi/instruments/perc44.sbi differ
diff --git a/lumps/genmidi/instruments/perc45.sbi b/lumps/genmidi/instruments/perc45.sbi
index 1bd632ff..238f071b 100644
Binary files a/lumps/genmidi/instruments/perc45.sbi and b/lumps/genmidi/instruments/perc45.sbi differ
diff --git a/lumps/genmidi/instruments/perc46-2.sbi b/lumps/genmidi/instruments/perc46-2.sbi
new file mode 100644
index 00000000..80a167fe
Binary files /dev/null and b/lumps/genmidi/instruments/perc46-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc46.sbi b/lumps/genmidi/instruments/perc46.sbi
index d725199d..45617615 100644
Binary files a/lumps/genmidi/instruments/perc46.sbi and b/lumps/genmidi/instruments/perc46.sbi differ
diff --git a/lumps/genmidi/instruments/perc47.sbi b/lumps/genmidi/instruments/perc47.sbi
index acb3aa92..fb7e073d 100644
Binary files a/lumps/genmidi/instruments/perc47.sbi and b/lumps/genmidi/instruments/perc47.sbi differ
diff --git a/lumps/genmidi/instruments/perc48.sbi b/lumps/genmidi/instruments/perc48.sbi
index 954c5dea..8f5716e1 100644
Binary files a/lumps/genmidi/instruments/perc48.sbi and b/lumps/genmidi/instruments/perc48.sbi differ
diff --git a/lumps/genmidi/instruments/perc49-2.sbi b/lumps/genmidi/instruments/perc49-2.sbi
new file mode 100644
index 00000000..70fc53bf
Binary files /dev/null and b/lumps/genmidi/instruments/perc49-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc49.sbi b/lumps/genmidi/instruments/perc49.sbi
index 8fb6a147..70fc53bf 100644
Binary files a/lumps/genmidi/instruments/perc49.sbi and b/lumps/genmidi/instruments/perc49.sbi differ
diff --git a/lumps/genmidi/instruments/perc50.sbi b/lumps/genmidi/instruments/perc50.sbi
index 6adaa151..2b02bd87 100644
Binary files a/lumps/genmidi/instruments/perc50.sbi and b/lumps/genmidi/instruments/perc50.sbi differ
diff --git a/lumps/genmidi/instruments/perc51-2.sbi b/lumps/genmidi/instruments/perc51-2.sbi
new file mode 100644
index 00000000..ed48cf65
Binary files /dev/null and b/lumps/genmidi/instruments/perc51-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc51.sbi b/lumps/genmidi/instruments/perc51.sbi
index 3211a558..42ff860c 100644
Binary files a/lumps/genmidi/instruments/perc51.sbi and b/lumps/genmidi/instruments/perc51.sbi differ
diff --git a/lumps/genmidi/instruments/perc52-2.sbi b/lumps/genmidi/instruments/perc52-2.sbi
new file mode 100644
index 00000000..6dc6b001
Binary files /dev/null and b/lumps/genmidi/instruments/perc52-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc52.sbi b/lumps/genmidi/instruments/perc52.sbi
index 81944bef..afbf1ac8 100644
Binary files a/lumps/genmidi/instruments/perc52.sbi and b/lumps/genmidi/instruments/perc52.sbi differ
diff --git a/lumps/genmidi/instruments/perc53.sbi b/lumps/genmidi/instruments/perc53.sbi
index e9bbe07a..ac30a37b 100644
Binary files a/lumps/genmidi/instruments/perc53.sbi and b/lumps/genmidi/instruments/perc53.sbi differ
diff --git a/lumps/genmidi/instruments/perc54-2.sbi b/lumps/genmidi/instruments/perc54-2.sbi
new file mode 100644
index 00000000..4b38eb9b
Binary files /dev/null and b/lumps/genmidi/instruments/perc54-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc54.sbi b/lumps/genmidi/instruments/perc54.sbi
index f975b53b..4ad32051 100644
Binary files a/lumps/genmidi/instruments/perc54.sbi and b/lumps/genmidi/instruments/perc54.sbi differ
diff --git a/lumps/genmidi/instruments/perc55-2.sbi b/lumps/genmidi/instruments/perc55-2.sbi
new file mode 100644
index 00000000..5b5c03cd
Binary files /dev/null and b/lumps/genmidi/instruments/perc55-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc55.sbi b/lumps/genmidi/instruments/perc55.sbi
new file mode 100644
index 00000000..babf1130
Binary files /dev/null and b/lumps/genmidi/instruments/perc55.sbi differ
diff --git a/lumps/genmidi/instruments/perc56.sbi b/lumps/genmidi/instruments/perc56.sbi
new file mode 100644
index 00000000..45a9ba32
Binary files /dev/null and b/lumps/genmidi/instruments/perc56.sbi differ
diff --git a/lumps/genmidi/instruments/perc57-2.sbi b/lumps/genmidi/instruments/perc57-2.sbi
new file mode 100644
index 00000000..29106240
Binary files /dev/null and b/lumps/genmidi/instruments/perc57-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc57.sbi b/lumps/genmidi/instruments/perc57.sbi
index 5ea17e57..29106240 100644
Binary files a/lumps/genmidi/instruments/perc57.sbi and b/lumps/genmidi/instruments/perc57.sbi differ
diff --git a/lumps/genmidi/instruments/perc58.sbi b/lumps/genmidi/instruments/perc58.sbi
new file mode 100644
index 00000000..05ed4b1a
Binary files /dev/null and b/lumps/genmidi/instruments/perc58.sbi differ
diff --git a/lumps/genmidi/instruments/perc59.sbi b/lumps/genmidi/instruments/perc59.sbi
index 2c13953c..bde0fb0b 100644
Binary files a/lumps/genmidi/instruments/perc59.sbi and b/lumps/genmidi/instruments/perc59.sbi differ
diff --git a/lumps/genmidi/instruments/perc60-2.sbi b/lumps/genmidi/instruments/perc60-2.sbi
new file mode 100644
index 00000000..f978fb86
Binary files /dev/null and b/lumps/genmidi/instruments/perc60-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc60.sbi b/lumps/genmidi/instruments/perc60.sbi
new file mode 100644
index 00000000..f25a0128
Binary files /dev/null and b/lumps/genmidi/instruments/perc60.sbi differ
diff --git a/lumps/genmidi/instruments/perc61-2.sbi b/lumps/genmidi/instruments/perc61-2.sbi
new file mode 100644
index 00000000..39563523
Binary files /dev/null and b/lumps/genmidi/instruments/perc61-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc61.sbi b/lumps/genmidi/instruments/perc61.sbi
new file mode 100644
index 00000000..ea65076b
Binary files /dev/null and b/lumps/genmidi/instruments/perc61.sbi differ
diff --git a/lumps/genmidi/instruments/perc62-2.sbi b/lumps/genmidi/instruments/perc62-2.sbi
new file mode 100644
index 00000000..d0b762fe
Binary files /dev/null and b/lumps/genmidi/instruments/perc62-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc62.sbi b/lumps/genmidi/instruments/perc62.sbi
new file mode 100644
index 00000000..98c79cda
Binary files /dev/null and b/lumps/genmidi/instruments/perc62.sbi differ
diff --git a/lumps/genmidi/instruments/perc63-2.sbi b/lumps/genmidi/instruments/perc63-2.sbi
new file mode 100644
index 00000000..c3a8008e
Binary files /dev/null and b/lumps/genmidi/instruments/perc63-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc63.sbi b/lumps/genmidi/instruments/perc63.sbi
new file mode 100644
index 00000000..fdb8ffbe
Binary files /dev/null and b/lumps/genmidi/instruments/perc63.sbi differ
diff --git a/lumps/genmidi/instruments/perc64-2.sbi b/lumps/genmidi/instruments/perc64-2.sbi
new file mode 100644
index 00000000..2bed40ea
Binary files /dev/null and b/lumps/genmidi/instruments/perc64-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc64.sbi b/lumps/genmidi/instruments/perc64.sbi
new file mode 100644
index 00000000..e6be3ae7
Binary files /dev/null and b/lumps/genmidi/instruments/perc64.sbi differ
diff --git a/lumps/genmidi/instruments/perc65.sbi b/lumps/genmidi/instruments/perc65.sbi
new file mode 100644
index 00000000..b1c5a6fb
Binary files /dev/null and b/lumps/genmidi/instruments/perc65.sbi differ
diff --git a/lumps/genmidi/instruments/perc66.sbi b/lumps/genmidi/instruments/perc66.sbi
new file mode 100644
index 00000000..fcc15443
Binary files /dev/null and b/lumps/genmidi/instruments/perc66.sbi differ
diff --git a/lumps/genmidi/instruments/perc67-2.sbi b/lumps/genmidi/instruments/perc67-2.sbi
new file mode 100644
index 00000000..6438722f
Binary files /dev/null and b/lumps/genmidi/instruments/perc67-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc67.sbi b/lumps/genmidi/instruments/perc67.sbi
new file mode 100644
index 00000000..d483156c
Binary files /dev/null and b/lumps/genmidi/instruments/perc67.sbi differ
diff --git a/lumps/genmidi/instruments/perc68-2.sbi b/lumps/genmidi/instruments/perc68-2.sbi
new file mode 100644
index 00000000..b38e67f3
Binary files /dev/null and b/lumps/genmidi/instruments/perc68-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc68.sbi b/lumps/genmidi/instruments/perc68.sbi
new file mode 100644
index 00000000..2afb642a
Binary files /dev/null and b/lumps/genmidi/instruments/perc68.sbi differ
diff --git a/lumps/genmidi/instruments/perc70.sbi b/lumps/genmidi/instruments/perc70.sbi
index 5314e0c3..f8f9e2d2 100644
Binary files a/lumps/genmidi/instruments/perc70.sbi and b/lumps/genmidi/instruments/perc70.sbi differ
diff --git a/lumps/genmidi/instruments/perc71.sbi b/lumps/genmidi/instruments/perc71.sbi
index e2379cde..93db1917 100644
Binary files a/lumps/genmidi/instruments/perc71.sbi and b/lumps/genmidi/instruments/perc71.sbi differ
diff --git a/lumps/genmidi/instruments/perc72.sbi b/lumps/genmidi/instruments/perc72.sbi
index 7f3443c9..16a2aba3 100644
Binary files a/lumps/genmidi/instruments/perc72.sbi and b/lumps/genmidi/instruments/perc72.sbi differ
diff --git a/lumps/genmidi/instruments/perc73-2.sbi b/lumps/genmidi/instruments/perc73-2.sbi
new file mode 100644
index 00000000..69854839
Binary files /dev/null and b/lumps/genmidi/instruments/perc73-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc73.sbi b/lumps/genmidi/instruments/perc73.sbi
index 2162dfb5..e27836b1 100644
Binary files a/lumps/genmidi/instruments/perc73.sbi and b/lumps/genmidi/instruments/perc73.sbi differ
diff --git a/lumps/genmidi/instruments/perc74-2.sbi b/lumps/genmidi/instruments/perc74-2.sbi
new file mode 100644
index 00000000..1c8d5b37
Binary files /dev/null and b/lumps/genmidi/instruments/perc74-2.sbi differ
diff --git a/lumps/genmidi/instruments/perc74.sbi b/lumps/genmidi/instruments/perc74.sbi
index f967f84e..9effbc8e 100644
Binary files a/lumps/genmidi/instruments/perc74.sbi and b/lumps/genmidi/instruments/perc74.sbi differ
diff --git a/lumps/genmidi/instruments/perc75.sbi b/lumps/genmidi/instruments/perc75.sbi
index 5b1bc798..120903f2 100644
Binary files a/lumps/genmidi/instruments/perc75.sbi and b/lumps/genmidi/instruments/perc75.sbi differ
diff --git a/lumps/genmidi/instruments/perc78.sbi b/lumps/genmidi/instruments/perc78.sbi
index e3520e82..fca96605 100644
Binary files a/lumps/genmidi/instruments/perc78.sbi and b/lumps/genmidi/instruments/perc78.sbi differ
diff --git a/lumps/genmidi/instruments/perc79.sbi b/lumps/genmidi/instruments/perc79.sbi
index 1e3b4372..6a1f2fc5 100644
Binary files a/lumps/genmidi/instruments/perc79.sbi and b/lumps/genmidi/instruments/perc79.sbi differ
diff --git a/lumps/genmidi/instruments/perc80.sbi b/lumps/genmidi/instruments/perc80.sbi
index a1d06cc6..f3240d14 100644
Binary files a/lumps/genmidi/instruments/perc80.sbi and b/lumps/genmidi/instruments/perc80.sbi differ
diff --git a/lumps/genmidi/instruments/perc81.sbi b/lumps/genmidi/instruments/perc81.sbi
index 2df3b3ca..076730e9 100644
Binary files a/lumps/genmidi/instruments/perc81.sbi and b/lumps/genmidi/instruments/perc81.sbi differ
diff --git a/lumps/genmidi/sbi_file.py b/lumps/genmidi/sbi_file.py
index c507375b..e6904e6d 100644
--- a/lumps/genmidi/sbi_file.py
+++ b/lumps/genmidi/sbi_file.py
@@ -35,7 +35,7 @@ def read(filename):
         raise Exception("Invalid header for SBI file!")
 
     instr_data = data[36:]
-    result = {"name": name.decode("ascii").rstrip("\0")}
+    result = {"name": name.decode("ascii").rstrip("\0").rstrip()}
 
     for i in range(len(FIELDS)):
         result[FIELDS[i]], = struct.unpack("B", instr_data[i : i + 1])