got up to subst2, added comments