Some more responsive fixes. It's all coming together now :)