more fixes to responsiveness