improvements in regexps. replacing digits with 9 instead of __NUMBER__.
improvements in number treatment in the regexps