Updated README.md + bugs fixed