...but there were a little too many strong feelings and highly-strung arguments for my liking, and I was probably as guilty as anyone else.

Well, Tony feels that everything was resolved acceptably on the weekend, so that all qualifies as sorted. I don't 100% agree, but everyone involved in any incidents genuinely apologised before too much time had elapsed, so it looks like we're moving on.