changes SType to S.Type and other small syntax changes