Update license and minor changes