extensive reworking of @score editions