some more responsive fixes