Improve clock align, some bug fix