Various timer handling updates (incomplete).