Readme changes and bug fixes