fixed date issues
fixed stuff