Fixed/updated/added to timer lib.