fixed timer restart issue
fixed timer and transition. added clearTimeout