fixed some issues with tools.cli