added date display
cleaned up