Added function for escaping specific characters.  Also some s/match/search/