Fixed issue with dates, need to fix page number now