fixes for responsiveness