license change, minor fixes