Also made date stored
Fixed the date parsing (and considerably enhanced it)
cosmetic changes