fixes across the board