more responsive fixes...