fixed bad index order in measures and some MSD quirks