make date & name handling more robust.