Multiple fixes to corrected time calculation, TOD calcs, etc.