Added match finish() with bug fixes