Clock changes and cleaning.  Nothing substantial.
Forgot to add this to inversion commit.