some more responsive improvements