More tweaking of assumptions.
More changes to README.