more responsive fixes
more responsive fixes