added checks for S-mode in p environment

[aswaterman]

Seems like what's actually missing is comments explaining the current (esoteric) implementation and assumptions.