Bug fixes and updated README