added matchlist and reworked some func names for consistency