Sorry I was away and without a computer for the day. I'm glad everything worked out in the end. Now you need to make him stick to the agreement. You both are so hot-headed. Leahsbeau is exactly right. You both need to learn to control what you say to each other.
