moved regexs to dictionary file; fixed resulting problems