Readjustments to clock

Lots of cleaning up aswell.