Updated README and another small bug fix