license changes, and minor fixes.