added more support for numbers as strings