fix external tool waiting, minor stuff