more revisions and refinements