more tweaks to pre-match