minor cleanup, clarification and integration of some comments