- Better parsing of numeric inputs

