pull request

Added a few more tools to close a few issues