Added support for numbers, cleaned up regexes