tool factory improvements