switch stuff to string-match-p