Fixed README and a couple of bugs