minor changes across the board