fixing more date problems