fix normalization for systematic variations, plus cosmetic fixes