Bug fix and tool udpate