Update number parsing

Use Val for parsing numbers

Fixes #17