added some tools and some changes