Improved some tools