Fixed fiscal year counter

And a lot of other stuff