step 1 and 2

fixed bob's code and implemented rember-all and subst-all