Not sure on the timing of that last item. I think you are entitled to ask for that and hope he would stick to the agreement but I'd make it quick and snappy and light.
Unfortunately, I think he'll do what he wants regardless but ya, making a mutual agreement might help and get him thinking about that it goes both ways.
The weekend thing...I know...all I can offer is a virtual hug. Can you go do something?
