fixing some tools