Improvements/fixes to match scoring + more test.