fix timer issue, and add phone and submit issue