update clock tables
improve group logic
fix coding error from last commit