fix a derp and do some more clock changes