new tools and bug fixes

Added new tools and fixed a few bugs