further tuning of regular expressions