Readme edits and some minor mostly cosmetic code changes