Fixed numbers parsing and made them look different