Fixed tracking & graphs generation.