more Principal/SS tweaks