all fixed and done