add more cases; adjust options; update README.md