added some tools
some fixes