improved the tool checks