Add simplify; correct readme; add tests
Correct simplify