Refactored converters

* Fixed number parsing
* Added date converting