Mostly cosmetic changes, update README.