with license and contact, MSL update and some clean up