obanyc-1277 (updated regexs), plus fix to misc stif trip matching