Update Readme and minor updates