minor updates across the board