Updating the README, and fixing a couple of minor bugs.