fixed timer bugs; close #33