added day and repaired broken round-tripping
added fix expand_date