minor improvements across the board