lots of clock tweaks, but still, STILL! not done, really