fixed timer bugs