love your ideas
that should fix annoying friendly matches and keep those that use frienslies as unofficial tournaments happy