changed column headings to match those used in paper, tidy up Match.js