added some fixes to account for singles matches