Added year- and currency-formatting to the formatter, also verfies integers