Fixing some bugs, now can almost start a match properly --- just no match is found