Fixing Date issues + many other things I do not remember now
Fixing dates