Lots of changes, mostly related to TimeSource.