date variables and other minor changes