Slight reorder and renaming to clarify, also update README.