various improvements across the board