A few bug fixes. Updates to the readme.