updates for topclock lib