quick fix on clock and output cleanup