#660 - update timeslot handling
#660 - update clock initialization