More corrections to clock model. Finished merging in work done on other laptop. All better now.
Added a temp label for the prejam clock