Bug fixes, updated README.md