Fix more, and updating README.md