Huge timer updates - simplifying, beautifying.