fixed issues with year start and year end