A,D rem old names, add normSc, tweaks