Fixed multiple bugs & updated README.md