fixed all that stuff I said I would