Licenses updated and some changes