Merging Craig's analog clock mode changes to my fork.