fixed timer problems