Bugfix: MIDI channels were discarded by the parser. Alse simplified code a bit.