updated match to use regex and be more useful