fill out more cases for match_subst
add some fancy unicode notation