License clarification, some refinements.