Improved number parsing
Added more results