- Fix and improve simple clock