Improvements to matchmaking and templates