tweaks to regex