Liscense and minor changes