Small changes to README

- reorganize a few instructions
- fix a few inconsistencies with README and code