Updated date tagger, and edited Date helper method