Finally fixed the number parsing wtih an expression that correctly parses all numbers.