more minor updates for consistency