tweaks to regexp