Major improvements for s.sub