fixed some tooling problems