add start timer
Fix some bugs