More readme clean-up and substitution API changes