added path, fixed date resolution