Noy, I sure am glad you guys got all this handled while I wasn't around. I'd probably have had to take the blame.
I only have one comment, everyone has at leat a little personality, and when you throw enough of them together, you're boung to have a few that conflict. It doesn't seem too fun, but sometimes the best way to resolve the conflicts is to let them come out and run their course. It looks like this is a prime example.