more responsive and fixes
fixes and more responsive