various fix for responsiveness