Fixing some minor bugs and updating README.md