more responsive fixes