Repairs and tooling

Repairs and tooling