Clock table: restored clock table at ONE X and added patches from Ntemis