timer improvements