Fix #78, #111 - Display the match endings properly