Updated README and a couple bugfixes