time and timer related changes