tooling and cli scripts update