* small fixes and error reporting for cli tools