tweaks across the board