fixes
improve responsiveness