the whole clock stuff needs some love - soon #2

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>