Updated Readme and bug fixes