Change to \compoundMeter. Fix various errata. Use explicit reharsal marks.