cosmetic fixes; natural order of issues