Readme/License files update and minor code changes