Minor fixes to dates. Still need to move to per-day calculations