Timer execution and bug fixes