Fixed the initial year to jump
Fixed some minor issues