Bug fixes and updated readme