Some comments, clarification and cleanup.