Bug fixes and updated Readme.