Bug fixes / README.md corrections.