update syntax in s4, fix typos in s2