Fixed a couple of problems with the date remembering