misc changes across the board