Some more MIDI display stuff, and general cleanup