1. license fix; 2. small changes