Fixed bug in date
Workin on nax toc