Further README edits, fix bug in doc test.