some more responsiveness tweaks