Revisited tools

Deleted unused tools, added new and revisited already existing and used
based on the latest experiences.