Formulation 05, minor fixes and changes.