Assorted Changes. Pass 3