hmm fixes for responsiveness