Update for TimeInfo and bug corrections