Team join/leave complete, Router adjustments, Template additions and refinements