It's great that the last two days have been better. But don't let your guard down. Use the fact that they can do it for a couple days show you and them that they are capable of it, and remind them that you expect that permanently. This is not to be a token measure, this is meant to be new behaviour. Call them on it every time their behaviour does not match the agreement.
Yes, absolutely. That is exactly my plan.