More edits and fixes, some expansions.