Update Readme and few fixes