Post-weekend edits and cleanup.