cleaner PitchMatrix interface. fix parsing for june 2012