apply some fixes to improve responsiveness