Changes from review comments and July 15 meeting, except changes
drwxr-xr-x - dwarf5