few fixes in timer