2 New Tools and some bug fixes