Fix a couple of bugs, update the README, and update setup.py with the latest README content.