bug fixes associated with number support, the regex is also now a
constant