Added error check on finishMatch()
Refactored methods for select/start match