Added safety checks;  Added toolset identification;