remove refs to s, minor fixes