multiSSH3 5.91__py3-none-any.whl → 6.2__py3-none-any.whl

multiSSH3.py

@@ -12,6 +12,7 @@ import getpass
 import glob
 import io
 import ipaddress
+import itertools
 import json
 import math
 import os
@@ -29,7 +30,7 @@ import threading
 import time
 import typing
 import uuid
-from collections import Counter, deque
+from collections import Counter, deque, defaultdict
 from itertools import count, product
 
 __curses_available = False
@@ -46,7 +47,6 @@ try:
 except ImportError:
 	pass
 
-
 try:
 	# Check if functiools.cache is available
 	# cache_decorator = functools.cache
@@ -84,10 +84,10 @@ except Exception:
 	print('Warning: functools.lru_cache is not available, multiSSH3 will run slower without cache.',file=sys.stderr)
 	def cache_decorator(func):
 		return func
-version = '5.91'
+version = '6.02'
 VERSION = version
 __version__ = version
-COMMIT_DATE = '2025-10-17'
+COMMIT_DATE = '2025-11-10'
 
 CONFIG_FILE_CHAIN = ['./multiSSH3.config.json',
 					 '~/multiSSH3.config.json',
@@ -153,33 +153,6 @@ def signal_handler(sig, frame):
 		os.system(f'pkill -ef {os.path.basename(__file__)}')
 		_exit_with_code(1, 'Exiting immediately due to Ctrl C')
 
-# def input_with_timeout_and_countdown(timeout, prompt='Please enter your selection'):
-# 	"""
-# 	Read an input from the user with a timeout and a countdown.
-
-# 	Parameters:
-# 	timeout (int): The timeout value in seconds.
-# 	prompt (str): The prompt message to display to the user. Default is 'Please enter your selection'.
-
-# 	Returns:
-# 	str or None: The user input if received within the timeout, or None if no input is received.
-# 	"""
-# 	import select
-# 	# Print the initial prompt with the countdown
-# 	eprint(f"{prompt} [{timeout}s]: ", end='', flush=True)
-# 	# Loop until the timeout
-# 	for remaining in range(timeout, 0, -1):
-# 		# If there is an input, return it
-# 		# this only works on linux
-# 		if sys.stdin in select.select([sys.stdin], [], [], 0)[0]:
-# 			return input().strip()
-# 		# Print the remaining time
-# 		eprint(f"\r{prompt} [{remaining}s]: ", end='', flush=True)
-# 		# Wait a second
-# 		time.sleep(1)
-# 	# If there is no input, return None
-# 	return None
-
 def input_with_timeout_and_countdown(timeout, prompt='Please enter your selection'):
 	"""
 	Read input from the user with a timeout (cross-platform).
@@ -312,6 +285,13 @@ extraargs={self.extraargs}, resolvedName={self.resolvedName}, i={self.i}, uuid={
 identity_file={self.identity_file}, ip={self.ip}, current_color_pair={self.current_color_pair}"
 	def __str__(self):
 		return f"Host(name={self.name}, command={self.command}, returncode={self.returncode}, stdout={self.stdout}, stderr={self.stderr})"
+	def get_output_hash(self):
+		return hash((
+			self.command,
+			tuple(self.stdout),
+			tuple(self.stderr),
+			self.returncode
+		))
 
 #%% ------------ Load Defaults ( Config ) File ----------------
 def load_config_file(config_file):
@@ -341,7 +321,7 @@ DEFAULT_HOSTS = 'all'
 DEFAULT_USERNAME = None
 DEFAULT_PASSWORD = ''
 DEFAULT_IDENTITY_FILE = None
-DEDAULT_SSH_KEY_SEARCH_PATH = '~/.ssh/'
+DEFAULT_SSH_KEY_SEARCH_PATH = '~/.ssh/'
 DEFAULT_USE_KEY = False
 DEFAULT_EXTRA_ARGS = None
 DEFAULT_ONE_ON_ONE = False
@@ -358,14 +338,23 @@ DEFAULT_INTERFACE_IP_PREFIX = None
 DEFAULT_IPMI_USERNAME = 'ADMIN'
 DEFAULT_IPMI_PASSWORD = ''
 DEFAULT_NO_WATCH = False
-DEFAULT_CURSES_MINIMUM_CHAR_LEN = 40
-DEFAULT_CURSES_MINIMUM_LINE_LEN = 1
+DEFAULT_WINDOW_WIDTH = 40
+DEFAULT_WINDOW_HEIGHT = 1
 DEFAULT_SINGLE_WINDOW = False
 DEFAULT_ERROR_ONLY = False
 DEFAULT_NO_OUTPUT = False
 DEFAULT_RETURN_ZERO = False
 DEFAULT_NO_ENV = False
-DEFAULT_ENV_FILE = '/etc/profile.d/hosts.sh'
+DEFAULT_ENV_FILE = ''
+DEFAULT_ENV_FILES = ['/etc/profile.d/hosts.sh',
+					 '~/.bashrc',
+					 '~/.zshrc',
+					 '~/host.env',
+					 '~/hosts.env',
+					 '.env',
+					 'host.env',
+					 'hosts.env',
+					 ]
 DEFAULT_NO_HISTORY = False
 DEFAULT_HISTORY_FILE = '~/.mssh_history'
 DEFAULT_MAX_CONNECTIONS = 4 * os.cpu_count()
@@ -375,7 +364,7 @@ DEFAULT_GREPPABLE_MODE = False
 DEFAULT_SKIP_UNREACHABLE = True
 DEFAULT_SKIP_HOSTS = ''
 DEFAULT_ENCODING = 'utf-8'
-DEFAULT_DIFF_DISPLAY_THRESHOLD = 0.75
+DEFAULT_DIFF_DISPLAY_THRESHOLD = 0.6
 SSH_STRICT_HOST_KEY_CHECKING = False
 FORCE_TRUECOLOR = False
 ERROR_MESSAGES_TO_IGNORE = [
@@ -387,6 +376,24 @@ ERROR_MESSAGES_TO_IGNORE = [
 	'Killed by signal',
 	'Connection reset by peer',
 ]
+__DEFAULT_COLOR_PALETTE = {
+	'cyan': (86, 173, 188),
+	'green': (114, 180, 43),
+	'magenta': (140, 107, 200),
+	'red': (196, 38, 94),
+	'white': (227, 227, 221),
+	'yellow': (179, 180, 43),
+	'blue': (106, 126, 200),
+	'bright_black': (102, 102, 102),
+	'bright_blue': (129, 154, 255),
+	'bright_cyan': (102, 217, 239),
+	'bright_green': (126, 226, 46),
+	'bright_magenta': (174, 129, 255),
+	'bright_red': (249, 38, 114),
+	'bright_white': (248, 248, 242),
+	'bright_yellow': (226, 226, 46),
+}
+COLOR_PALETTE = __DEFAULT_COLOR_PALETTE.copy()
 _DEFAULT_CALLED = True
 _DEFAULT_RETURN_UNFINISHED = False
 _DEFAULT_UPDATE_UNREACHABLE_HOSTS = True
@@ -406,6 +413,9 @@ if __ERROR_MESSAGES_TO_IGNORE_REGEX:
 	__ERROR_MESSAGES_TO_IGNORE_REGEX = re.compile(__ERROR_MESSAGES_TO_IGNORE_REGEX)
 else:
 	__ERROR_MESSAGES_TO_IGNORE_REGEX =  re.compile('|'.join(ERROR_MESSAGES_TO_IGNORE))
+if DEFAULT_ENV_FILE:
+	if DEFAULT_ENV_FILE not in DEFAULT_ENV_FILES:
+		DEFAULT_ENV_FILES.append(DEFAULT_ENV_FILE)
 
 #%% Load mssh Functional Global Variables
 __global_suppress_printout = False
@@ -413,7 +423,7 @@ __mainReturnCode = 0
 __failedHosts = set()
 __wildCharacters = ['*','?','x']
 _no_env = DEFAULT_NO_ENV
-_env_file = DEFAULT_ENV_FILE
+_env_files = DEFAULT_ENV_FILES
 __globalUnavailableHosts = dict()
 __ipmiiInterfaceIPPrefix = DEFAULT_IPMI_INTERFACE_IP_PREFIX
 __keyPressesIn = [[]]
@@ -427,6 +437,11 @@ __thread_start_delay = 0
 _encoding = DEFAULT_ENCODING
 __returnZero = DEFAULT_RETURN_ZERO
 __running_threads = set()
+__control_master_string = '''Host *
+  ControlMaster auto
+  ControlPath /run/user/%i/ssh_sockets_%C
+  ControlPersist 3600
+'''
 if __resource_lib_available:
 	# Get the current limits
 	_, __system_nofile_limit = resource.getrlimit(resource.RLIMIT_NOFILE)
@@ -474,12 +489,12 @@ def check_path(program_name):
 
 [check_path(program) for program in _binCalled]
 
-def find_ssh_key_file(searchPath = DEDAULT_SSH_KEY_SEARCH_PATH):
+def find_ssh_key_file(searchPath = DEFAULT_SSH_KEY_SEARCH_PATH):
 	'''
 	Find the ssh public key file
 
 	Args:
-		searchPath (str, optional): The path to search. Defaults to DEDAULT_SSH_KEY_SEARCH_PATH.
+		searchPath (str, optional): The path to search. Defaults to DEFAULT_SSH_KEY_SEARCH_PATH.
 
 	Returns:
 		str: The path to the ssh key file
@@ -495,35 +510,65 @@ def find_ssh_key_file(searchPath = DEDAULT_SSH_KEY_SEARCH_PATH):
 	return None
 
 @cache_decorator
-def readEnvFromFile(environemnt_file = ''):
+def readEnvFromFile():
 	'''
 	Read the environment variables from env_file
 	Returns:
 		dict: A dictionary of environment variables
 	'''
-	global env
-	try:
-		if env:
-			return env
-	except Exception:
-		env = {}
-	global _env_file
-	if environemnt_file:
-		envf = environemnt_file
-	else:
-		envf = _env_file if _env_file else DEFAULT_ENV_FILE
-	if os.path.exists(envf):
-		with open(envf,'r') as f:
-			for line in f:
-				if line.startswith('#') or not line.strip():
+	global _env_files
+	global _no_env
+	envfs = _env_files if _env_files else DEFAULT_ENV_FILES
+	translator = str.maketrans('&|"', ';;\'')
+	replacement_re = re.compile(r'\$(?:[A-Za-z_]\w*|\{[A-Za-z_]\w*\})')
+	environemnt = {}
+	scrubCounter = 0
+	for envf in envfs:
+		envf = os.path.expanduser(os.path.expandvars(envf))
+		if os.path.exists(envf):
+			with open(envf,'r') as f:
+				lines = f.readlines()
+			for line in lines:
+				line = line.strip()
+				if not line or line.startswith('#') or '=' not in line:
 					continue
-				key, value = line.replace('export ', '', 1).strip().split('=', 1)
-				key = key.strip().strip('"').strip("'")
-				value = value.strip().strip('"').strip("'")
-				# avoid infinite recursion
-				if key != value:
-					env[key] = value.strip('"').strip("'")
-	return env
+				line = line.translate(translator)
+				commands = re.split(r";(?=(?:[^']*'[^']*')*[^']*$)", line)
+				for command in commands:
+					if not command or command.startswith('#') or '=' not in command or command.startswith('alias '):
+						continue
+					fields = re.split(r" (?=(?:[^']*'[^']*')*[^']*$)", command)
+					for field in fields:
+						try:
+							if field.startswith('export '):
+								field = field.replace('export ', '', 1).strip()
+							if not field or field.startswith('#') or '=' not in field:
+								continue
+							key, _, values = field.partition('=')
+							key = key.strip().strip("'")
+							values = values.strip().strip("'")
+							if '$' in values:
+								scrubCounter += 16
+							if key and values and key != values:
+								environemnt[key] = values
+						except Exception:
+							continue
+	while scrubCounter:
+		scrubCounter -= 1
+		found = False
+		for key, value in environemnt.items():
+			if '$' in value:
+				for match in replacement_re.findall(value):
+					ref_key = match.strip('${}')
+					ref_value = environemnt.get(ref_key) if ref_key != key else None
+					if not ref_value and not _no_env:
+						ref_value = os.environ.get(ref_key)
+					if ref_value:
+						environemnt[key] = value.replace(match, ref_value)
+						found = True
+		if not found:
+			break
+	return environemnt
 
 def replace_magic_strings(string,keys,value,case_sensitive=False):
 	'''
@@ -650,8 +695,6 @@ def format_commands(commands):
 			eprint(f"Warning: commands should ideally be a list of strings. Now mssh had failed to convert {commands!r} to a list of strings. Continuing anyway but expect failures. Error: {e}")
 	return commands
 
-
-
 class OrderedMultiSet(deque):
 	"""
 	A deque extension with O(1) average lookup time.
@@ -663,60 +706,138 @@ class OrderedMultiSet(deque):
 		self._counter = Counter()
 		if iterable is not None:
 			self.extend(iterable)
-	def __decrease_count(self, item):
-		"""Decrease count of item in counter."""
-		self._counter[item] -= 1
-		if self._counter[item] == 0:
-			del self._counter[item]
-		return self._counter.get(item, 0)
-	def append(self, item,left=False):
+	def append(self, item):
 		"""Add item to the right end. O(1)."""
-		removed = None
-		if self.maxlen is not None and len(self) == self.maxlen:
-			removed = self[-1] if left else self[0]  # Item that will be removed
-			self.__decrease_count(removed)
-		super().appendleft(item) if left else super().append(item) 
+		if len(self) == self.maxlen:
+			self._counter -= Counter([self[0]])
+			# self._counter[self[0]] -= 1
+			# self._counter += Counter()
+		super().append(item) 
 		self._counter[item] += 1
-		return removed
 	def appendleft(self, item):
 		"""Add item to the left end. O(1)."""
-		return self.append(item,left=True)
-	def pop(self,left=False):
+		if len(self) == self.maxlen:
+			self._counter -= Counter([self[-1]])
+		super().appendleft(item)
+		self._counter[item] += 1
+	def pop(self):
 		"""Remove and return item from right end. O(1)."""
-		if not self:
+		try:
+			item = super().pop()
+			self._counter -= Counter([item])
+			return item
+		except IndexError:
 			return None
-		item = super().popleft() if left else super().pop()
-		self.__decrease_count(item)
-		return item
 	def popleft(self):
 		"""Remove and return item from left end. O(1)."""
-		return self.pop(left=True)
+		try:
+			item = super().popleft()
+			self._counter -= Counter([item])
+			return item
+		except IndexError:
+			return None
+	def put(self, item):
+		"""Alias for append, but return removed item - add to right end (FIFO put)."""
+		removed = None
+		if len(self) == self.maxlen:
+			removed = self[0]  # Item that will be removed
+			self._counter -= Counter([removed])
+		super().append(item) 
+		self._counter[item] += 1
+		return removed
+	def put_left(self, item):
+		"""Alias for appendleft, but return removed item - add to left end (LIFO put)."""
+		removed = None
+		if len(self) == self.maxlen:
+			removed = self[-1]  # Item that will be removed
+			self._counter -= Counter([removed])
+		super().appendleft(item)
+		self._counter[item] += 1
+		return removed
+	def get(self):
+		"""Alias for popleft - remove from left end (FIFO get)."""
+		return self.popleft()
 	def remove(self, value):
 		"""Remove first occurrence of value. O(n)."""
 		if value not in self._counter:
 			return None
 		super().remove(value)
-		self.__decrease_count(value)
+		self._counter -= Counter([value])
 	def clear(self):
 		"""Remove all items. O(1)."""
 		super().clear()
 		self._counter.clear()
 	def extend(self, iterable):
 		"""Extend deque by appending elements from iterable. O(k)."""
-		for item in iterable:
-			self.append(item)
+		# if maxlen is set, and the new length exceeds maxlen, we clear then efficiently extend
+		try:
+			if not self.maxlen or len(self) + len(iterable) <= self.maxlen:
+				super().extend(iterable)
+				self._counter.update(iterable)
+			elif len(iterable) >= self.maxlen:
+				self.clear()
+				if isinstance(iterable, (list, tuple)):
+					iterable = iterable[-self.maxlen:]
+				else:
+					iterable = itertools.islice(iterable, len(iterable) - self.maxlen, None)
+				super().extend(iterable)
+				self._counter.update(iterable)
+			else:
+				num_to_keep = self.maxlen - len(iterable)
+				self.truncateright(num_to_keep)
+				super().extend(iterable)
+				self._counter.update(iterable)
+		except TypeError:
+			return self.extend(list(iterable))
 	def extendleft(self, iterable):
 		"""Extend left side by appending elements from iterable. O(k)."""
-		for item in iterable:
-			self.appendleft(item)
+		# if maxlen is set, and the new length exceeds maxlen, we clear then efficiently extendleft
+		try:
+			if not self.maxlen or len(self) + len(iterable) <= self.maxlen:
+				super().extendleft(iterable)
+				self._counter.update(iterable)
+			elif len(iterable) >= self.maxlen:
+				self.clear()
+				if isinstance(iterable, (list, tuple)):
+					iterable = iterable[:self.maxlen]
+				else:
+					iterable = itertools.islice(iterable, 0, self.maxlen)
+				super().extendleft(iterable)
+				self._counter.update(iterable)
+			else:
+				num_to_keep = self.maxlen - len(iterable)
+				self.truncate(num_to_keep)
+				super().extendleft(iterable)
+				self._counter.update(iterable)
+		except TypeError:
+			return self.extendleft(list(iterable))
+	def update(self, iterable):
+		"""Extend deque by appending elements from iterable. Alias for extend. O(k)."""
+		return self.extend(iterable)
+	def updateleft(self, iterable):
+		"""Extend left side by appending elements from iterable. Alias for extendleft. O(k)."""
+		return self.extendleft(iterable)
+	def truncate(self, n):
+		"""Truncate to keep left n items. O(n)."""
+		kept = list(itertools.islice(self, n))
+		dropped = Counter(itertools.islice(self, n, None))
+		super().clear()
+		super().extend(kept)
+		self._counter -= dropped
+	def truncateright(self, n):
+		"""Truncate to keep right n items. O(n)."""
+		kept = list(itertools.islice(self, len(self) - n, None))
+		dropped = Counter(itertools.islice(self, 0, len(self) - n))
+		super().clear()
+		super().extend(kept)
+		self._counter -= dropped
 	def rotate(self, n=1):
 		"""Rotate deque n steps to the right. O(k) where k = min(n, len)."""
-		if not self:
-			return
 		super().rotate(n)
 	def __contains__(self, item):
 		"""Check if item exists in deque. O(1) average."""
-		return item in self._counter
+		# return item in self._counter
+		return super().__contains__(item)
 	def count(self, item):
 		"""Return number of occurrences of item. O(1)."""
 		return self._counter[item]
@@ -724,14 +845,14 @@ class OrderedMultiSet(deque):
 		"""Set item at index. O(1) for access, O(1) for counter update."""
 		old_value = self[index]
 		super().__setitem__(index, value)
-		self.__decrease_count(old_value)
+		self._counter -= Counter([old_value])
 		self._counter[value] += 1
 		return old_value
 	def __delitem__(self, index):
 		"""Delete item at index. O(n) for deletion, O(1) for counter update."""
 		value = self[index]
 		super().__delitem__(index)
-		self.__decrease_count(value)
+		self._counter -= Counter([value])
 		return value
 	def insert(self, index, value):
 		"""Insert value at index. O(n) for insertion, O(1) for counter update."""
@@ -753,22 +874,40 @@ class OrderedMultiSet(deque):
 		if self.maxlen is not None:
 			return f"OrderedMultiSet({list(self)}, maxlen={self.maxlen})"
 		return f"OrderedMultiSet({list(self)})"
-	def put(self, item,left=False):
-		"""Alias for append - add to right end (FIFO put)."""
-		return self.append(item,left=left)
-	def get(self,left=True):
-		"""Alias for popleft - remove from left end (FIFO get)."""
-		return self.pop(left=left)
 	def peek(self):
 		"""Return leftmost item without removing it."""
-		if not self:
+		try:
+			return self[0]
+		except IndexError:
 			return None
-		return self[0]
 	def peek_right(self):
 		"""Return rightmost item without removing it."""
-		if not self:
+		try:
+			return self[-1]
+		except IndexError:
 			return None
-		return self[-1]
+	def __iadd__(self, value):
+		return self.extend(value)
+	def __add__(self, value):
+		new_deque = self.copy()
+		new_deque.extend(value)
+		return new_deque
+	def __mul__(self, value):
+		new_deque = OrderedMultiSet(maxlen=self.maxlen)
+		for _ in range(value):
+			new_deque.extend(self)
+		return new_deque
+	def __imul__(self, value):
+		if value <= 0:
+			self.clear()
+			return self
+		for _ in range(value - 1):
+			self.extend(self)
+		return self
+	def __eq__(self, value):
+		if isinstance(value, OrderedMultiSet):
+			return self._counter == value._counter
+		return super().__eq__(value)
 
 def get_terminal_size():
 	'''
@@ -814,6 +953,8 @@ def get_terminal_color_capability():
 		return '24bit'
 	elif "256" in term:
 		return '256'
+	elif "16" in term:
+		return '16'
 	try:
 		curses.setupterm()
 		colors = curses.tigetnum("colors")
@@ -832,96 +973,120 @@ def get_terminal_color_capability():
 		return 'None'
 
 @cache_decorator
-def get_xterm256_palette():
-	palette = []
-	# 0–15: system colors (we'll just fill with dummy values;
-	# you could fill in real RGB if you need to)
-	system_colors = [
-		(0, 0, 0), (128, 0, 0), (0, 128, 0), (128, 128, 0),
-		(0, 0, 128), (128, 0, 128), (0, 128, 128), (192, 192, 192),
-		(128, 128, 128), (255, 0, 0), (0, 255, 0), (255, 255, 0),
-		(0, 0, 255), (255, 0, 255), (0, 255, 255), (255, 255, 255),
-	]
-	palette.extend(system_colors)
-	# 16–231: 6x6x6 color cube
-	levels = [0, 95, 135, 175, 215, 255]
-	for r in levels:
-		for g in levels:
-			for b in levels:
-				palette.append((r, g, b))
-	# 232–255: grayscale ramp, 24 steps from 8 to 238
-	for i in range(24):
-		level = 8 + i * 10
-		palette.append((level, level, level))
-	return palette
+def rgb_to_ansi_color_string(r, g, b):
+	"""
+	Return an ANSI escape sequence setting the foreground to (r,g,b)
+	approximated to the terminal's capability, or '' if none.
+	"""
+	cap = get_terminal_color_capability()
+	if cap == 'None':
+		return ''
+	if cap == '24bit':
+		return f'\x1b[38;2;{r};{g};{b}m'
+	if cap == '256':
+		idx = _rgb_to_256_color(r, g, b)
+		return f'\x1b[38;5;{idx}m'
+	if cap == '16':
+		idx = _rgb_to_16_color(r, g, b)
+		# 0–7 = 30–37, 8–15 = 90–97
+		if idx < 8:
+			return f'\x1b[{30 + idx}m'
+		else:
+			return f'\x1b[{90 + (idx - 8)}m'
+	if cap == '8':
+		idx = _rgb_to_8_color(r, g, b)
+		return f'\x1b[{30 + idx}m'
+	return ''
 
-@cache_decorator
-def rgb_to_xterm_index(r, g, b):
+def _rgb_to_256_color(r, g, b):
 	"""
-	Map 24-bit RGB to nearest xterm-256 color index.
-	r, g, b should be in 0-255.
-	Returns an int in 0-255.
+	Map (r,g,b) to the 256-color cube or grayscale ramp.
 	"""
-	best_index = 0
+	# if it’s already gray, use the 232–255 grayscale ramp
+	if r == g == b:
+		# 24 shades from 232 to 255
+		return 232 + int(round(r / 255 * 23))
+	# else map each channel to 0–5
+	def to6(v):
+		return int(round(v / 255 * 5))
+	r6, g6, b6 = to6(r), to6(g), to6(b)
+	return 16 + 36 * r6 + 6 * g6 + b6
+
+def _rgb_to_16_color(r, g, b):
+	"""
+	Pick the nearest of the 16 ANSI standard colors.
+	Returns an index 0-15.
+	"""
+	palette = [
+		(0, 0, 0),       # 0 black
+		(128, 0, 0),     # 1 red
+		(0, 128, 0),     # 2 green
+		(128, 128, 0),   # 3 yellow
+		(0, 0, 128),     # 4 blue
+		(128, 0, 128),   # 5 magenta
+		(0, 128, 128),   # 6 cyan
+		(192, 192, 192), # 7 white (light gray)
+		(128, 128, 128), # 8 bright black (dark gray)
+		(255, 0, 0),     # 9 bright red
+		(0, 255, 0),     # 10 bright green
+		(255, 255, 0),   # 11 bright yellow
+		(0, 0, 255),     # 12 bright blue
+		(255, 0, 255),   # 13 bright magenta
+		(0, 255, 255),   # 14 bright cyan
+		(255, 255, 255), # 15 bright white
+	]
+	best_idx = 0
 	best_dist = float('inf')
-	for i, (pr, pg, pb) in enumerate(get_xterm256_palette()):
-		dr = pr - r
-		dg = pg - g
-		db = pb - b
-		dist = dr*dr + dg*dg + db*db
+	for i, (pr, pg, pb) in enumerate(palette):
+		dist = (r - pr)**2 + (g - pg)**2 + (b - pb)**2
 		if dist < best_dist:
 			best_dist = dist
-			best_index = i
-	return best_index
+			best_idx = i
+	return best_idx
 
-@cache_decorator
-def hashable_to_color(n, brightness_threshold=500):
-	hash_value = hash(str(n))
+def _rgb_to_8_color(r, g, b):
+	"""
+	Reduce to 8 colors by mapping to the 16-color index then clamping 0-7.
+	"""
+	return _rgb_to_16_color(r//2, g//2, b//2)
+
+
+def int_to_color(hash_value, min_brightness=100,max_brightness=220):
 	r = (hash_value >> 16) & 0xFF
 	g = (hash_value >> 8) & 0xFF
 	b = hash_value & 0xFF
-	if (r + g + b) < brightness_threshold:
-		return hashable_to_color(hash_value, brightness_threshold)
+	brightness = math.sqrt(0.299 * r**2 + 0.587 * g**2 + 0.114 * b**2)
+	if brightness < min_brightness:
+		return int_to_color(hash(str(hash_value)), min_brightness, max_brightness)
+	if brightness > max_brightness:
+		return int_to_color(hash(str(hash_value)), min_brightness, max_brightness)
 	return (r, g, b)
 
-__previous_ansi_color_index = -1
+__previous_color_rgb = ()
 @cache_decorator
-def string_to_unique_ansi_color(string):
+def int_to_unique_ansi_color(number):
 	'''
-	Convert a string to a unique ANSI color code
+	Convert a number to a unique ANSI color code
 
 	Args:
-		string (str): The string to convert
-
+		number (int): The number to convert
 	Returns:
 		int: The ANSI color code
 	'''
-	global __previous_ansi_color_index
+	global __previous_color_rgb
 	# Use a hash function to generate a consistent integer from the string
 	color_capability = get_terminal_color_capability()
-	index = None
 	if color_capability == 'None':
 		return ''
-	elif color_capability == '16':
-		# Map to one of the 14 colors (31-37, 90-96), avoiding black and white
-		index = (hash(string) % 14) + 31
-		if index > 37:
-			index += 52  # Bright colors (90-97)
-	elif color_capability == '8':
-		index = (hash(string) % 6) + 31
-	r,g,b = hashable_to_color(string)
-	if color_capability == '256':
-		index = rgb_to_xterm_index(r,g,b)
-	if index:
-		if index == __previous_ansi_color_index:
-			return string_to_unique_ansi_color(hash(string))
-		__previous_ansi_color_index = index
-		if color_capability == '256':
-			return f'\033[38;5;{index}m'
-		else:
-			return f'\033[{index}m'
+	if color_capability == '24bit':
+		r, g, b = int_to_color(number)
 	else:
-		return f'\033[38;2;{r};{g};{b}m'
+		# for 256 colors and below, reduce brightness threshold as we do not have many color to work with
+		r, g, b = int_to_color(number, min_brightness=70, max_brightness=190)
+	if sum(abs(a - b) for a, b in zip((r, g, b), __previous_color_rgb)) <= 256:
+		r, g, b = int_to_color(hash(str(number)))
+	__previous_color_rgb = (r, g, b)
+	return rgb_to_ansi_color_string(r, g, b)
 
 #%% ------------ Compacting Hostnames ----------------
 def __tokenize_hostname(hostname):
@@ -1267,13 +1432,18 @@ def compact_hostnames(Hostnames,verify = True):
 		['sub-s[1-2]']
 	"""
 	global __global_suppress_printout
-	if not isinstance(Hostnames, frozenset):
-		hostSet = frozenset(Hostnames)
-	else:
-		hostSet = Hostnames
+	# if not isinstance(Hostnames, frozenset):
+	# 	hostSet = frozenset(Hostnames)
+	# else:
+	# 	hostSet = Hostnames
+	hostSet = frozenset(expand_hostnames(
+		hostname.strip()
+		for hostnames_str in Hostnames
+		for hostname in hostnames_str.split(',')
+	))
 	compact_hosts = __compact_hostnames(hostSet)
 	if verify:
-		if set(expand_hostnames(compact_hosts)) != set(expand_hostnames(hostSet)):
+		if frozenset(expand_hostnames(compact_hosts)) != hostSet:
 			if not __global_suppress_printout:
 				eprint(f"Error compacting hostnames: {hostSet} -> {compact_hosts}")
 			compact_hosts = hostSet
@@ -1502,51 +1672,53 @@ def __handle_reading_stream(stream,target, host,buffer:io.BytesIO):
 		buffer.truncate(0)
 		host.output_buffer.seek(0)
 		host.output_buffer.truncate(0)
-
-	for char in iter(lambda:stream.read(1), b''):
-		host.lastUpdateTime = time.monotonic()
-		if char == b'\n':
-			add_line(buffer,target, host)
-			continue
-		elif char == b'\r':
-			buffer.seek(0)
-			host.output_buffer.seek(0)
-		elif char == b'\x08':
-			# backspace
-			if buffer.tell() > 0:
-				buffer.seek(buffer.tell() - 1)
-				buffer.truncate()
-			if host.output_buffer.tell() > 0:
-				host.output_buffer.seek(host.output_buffer.tell() - 1)
-				host.output_buffer.truncate()
-		else:
-			# normal character
-			buffer.write(char)
-			host.output_buffer.write(char)
-		# if the length of the buffer is greater than 100, we try to decode the buffer to find if there are any unicode line change chars
-		if buffer.tell() % 100 == 0 and buffer.tell() > 0:
-			try:
-				# try to decode the buffer to find if there are any unicode line change chars
-				decodedLine = buffer.getvalue().decode(_encoding,errors='backslashreplace')
-				lines = decodedLine.splitlines()
-				if len(lines) > 1:
-					# if there are multiple lines, we add them to the target
-					for line in lines[:-1]:
-						# for all lines except the last one, we add them to the target
-						target.append(line)
-						host.output.append(line)
-						host.lineNumToPrintSet.add(len(host.output)-1)
-					# we keep the last line in the buffer
-					buffer.seek(0)
-					buffer.truncate(0)
-					buffer.write(lines[-1].encode(_encoding,errors='backslashreplace'))
-					host.output_buffer.seek(0)
-					host.output_buffer.truncate(0)
-					host.output_buffer.write(lines[-1].encode(_encoding,errors='backslashreplace'))
-				
-			except UnicodeDecodeError:
-				# if there is a unicode decode error, we just skip this character
+	try:
+		for char in iter(lambda:stream.read(1), b''):
+			host.lastUpdateTime = time.monotonic()
+			if char == b'\n':
+				add_line(buffer,target, host)
 				continue
+			elif char == b'\r':
+				buffer.seek(0)
+				host.output_buffer.seek(0)
+			elif char == b'\x08':
+				# backspace
+				if buffer.tell() > 0:
+					buffer.seek(buffer.tell() - 1)
+					buffer.truncate()
+				if host.output_buffer.tell() > 0:
+					host.output_buffer.seek(host.output_buffer.tell() - 1)
+					host.output_buffer.truncate()
+			else:
+				# normal character
+				buffer.write(char)
+				host.output_buffer.write(char)
+			# if the length of the buffer is greater than 100, we try to decode the buffer to find if there are any unicode line change chars
+			if buffer.tell() % 100 == 0 and buffer.tell() > 0:
+				try:
+					# try to decode the buffer to find if there are any unicode line change chars
+					decodedLine = buffer.getvalue().decode(_encoding,errors='backslashreplace')
+					lines = decodedLine.splitlines()
+					if len(lines) > 1:
+						# if there are multiple lines, we add them to the target
+						for line in lines[:-1]:
+							# for all lines except the last one, we add them to the target
+							target.append(line)
+							host.output.append(line)
+							host.lineNumToPrintSet.add(len(host.output)-1)
+						# we keep the last line in the buffer
+						buffer.seek(0)
+						buffer.truncate(0)
+						buffer.write(lines[-1].encode(_encoding,errors='backslashreplace'))
+						host.output_buffer.seek(0)
+						host.output_buffer.truncate(0)
+						host.output_buffer.write(lines[-1].encode(_encoding,errors='backslashreplace'))
+					
+				except UnicodeDecodeError:
+					# if there is a unicode decode error, we just skip this character
+					continue
+	except ValueError:
+		pass
 	if buffer.tell() > 0:
 		# if there is still some data in the buffer, we add it to the target
 		add_line(buffer,target, host)
@@ -1590,7 +1762,7 @@ def __handle_writing_stream(stream,stop_event,host):
 	#     host.output.append(' $ ' + ''.join(__keyPressesIn[-1]).encode().decode().replace('\n', '↵'))
 	#     host.stdout.append(' $ ' + ''.join(__keyPressesIn[-1]).encode().decode().replace('\n', '↵'))
 	return sentInputPos
-	
+
 def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 	'''
 	Run the command on the host. Will format the commands accordingly. Main execution function.
@@ -1641,6 +1813,7 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 		host.command = replace_magic_strings(host.command,['#I#'],str(host.i),case_sensitive=False)
 		host.command = replace_magic_strings(host.command,['#PASSWD#','#PASSWORD#'],passwds,case_sensitive=False)
 		host.command = replace_magic_strings(host.command,['#UUID#'],str(host.uuid),case_sensitive=False)
+		host.command = replace_magic_strings(host.command,['#IP#'],str(host.ip),case_sensitive=False)
 		formatedCMD = []
 		if host.extraargs and isinstance(host.extraargs, str):
 			extraargs = host.extraargs.split()
@@ -1839,8 +2012,6 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 			stdout_thread.join(timeout=1)
 			stderr_thread.join(timeout=1)
 			stdin_thread.join(timeout=1)
-			# here we handle the rest of the stdout after the subprocess returns
-			host.output.append('Pipe Closed. Trying to read the rest of the stdout...')
 			if not _emo:
 				stdout = None
 				stderr = None
@@ -1849,8 +2020,10 @@ def run_command(host, sem, timeout=60,passwds=None, retry_limit = 5):
 				except subprocess.TimeoutExpired:
 					pass
 				if stdout:
+					host.output.append('Trying to read the rest of the stdout...')
 					__handle_reading_stream(io.BytesIO(stdout),host.stdout, host,host.stdout_buffer)
 				if stderr:
+					host.output.append('Trying to read the rest of the stderr...')
 					__handle_reading_stream(io.BytesIO(stderr),host.stderr, host,host.stderr_buffer)
 				# if the last line in host.stderr is Connection to * closed., we will remove it
 			host.returncode = proc.poll()
@@ -2260,7 +2433,7 @@ def _get_hosts_to_display (hosts, max_num_hosts, hosts_to_display = None, indexO
 			rearrangedHosts.add(host)
 	return new_hosts_to_display , {'running':len(running_hosts), 'failed':len(failed_hosts), 'finished':len(finished_hosts), 'waiting':len(waiting_hosts)}, rearrangedHosts
 
-def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,single_window=DEFAULT_SINGLE_WINDOW,help_shown = False, config_reason = 'New Configuration'):
+def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min_char_len = DEFAULT_WINDOW_WIDTH, min_line_len = DEFAULT_WINDOW_HEIGHT,single_window=DEFAULT_SINGLE_WINDOW,help_shown = False, config_reason = 'New Configuration'):
 	global _encoding
 	_ = config_reason
 	try:
@@ -2446,7 +2619,7 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 				elif key == curses.KEY_EXIT or key == 27: # 27 is the key code for ESC
 					# if the key is exit, we will exit the program
 					return 
-				elif key == curses.KEY_HELP or key == 63 or key == curses.KEY_F1 or key == 8: # 63 is the key code for ?
+				elif key == curses.KEY_HELP or key == 63 or key == curses.KEY_F1 or key == 8: # 63 is the key code for ?, 8 is the key code for backspace
 					# if the key is help, we will display the help message
 					if not help_shown:
 						help_panel.show()
@@ -2581,7 +2754,7 @@ def __generate_display(stdscr, hosts, lineToDisplay = -1,curserPosition = 0, min
 		return (lineToDisplay,curserPosition , min_char_len, min_line_len, single_window,help_shown, f'Error: {str(e)}',traceback.format_exc())
 	return None
 
-def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,single_window = DEFAULT_SINGLE_WINDOW):
+def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_WINDOW_WIDTH, min_line_len = DEFAULT_WINDOW_HEIGHT,single_window = DEFAULT_SINGLE_WINDOW):
 	'''
 	Print the output of the hosts on the screen
 
@@ -2655,160 +2828,272 @@ def curses_print(stdscr, hosts, threads, min_char_len = DEFAULT_CURSES_MINIMUM_C
 
 #%% ------------ Generate Output Block ----------------
 def can_merge(line_bag1, line_bag2, threshold):
-	bag1_iter = iter(line_bag1)
-	found = False
-	for _ in range(max(int(len(line_bag1) * (1-threshold)),1)):
-		try:
-			item = next(bag1_iter)
-		except StopIteration:
-			break
-		if item in line_bag2:
-			found = True
-			break
-	if not found:
-		return False
-	return len(line_bag1.symmetric_difference(line_bag2)) < max((len(line_bag1) + len(line_bag2)) * (1 - threshold),1)
+	if threshold > 0.5:
+		samples = itertools.islice(line_bag1, max(int(len(line_bag1) * (1 - threshold)),1))
+		if not line_bag2.intersection(samples):
+			return False
+	return len(line_bag1.intersection(line_bag2)) >= min(len(line_bag1),len(line_bag2)) * threshold
 
 def mergeOutput(merging_hostnames,outputs_by_hostname,output,diff_display_threshold,line_length):
-	indexes = {hostname: 0 for hostname in merging_hostnames}
-	working_indexes = indexes.copy()
+	#indexes = {hostname: 0 for hostname in merging_hostnames}
+	indexes = Counter({hostname: 0 for hostname in merging_hostnames})
+	working_index_keys = set(merging_hostnames)
 	previousBuddies = set()
-	hostnameWrapper = textwrap.TextWrapper(width=line_length - 1, tabsize=4, replace_whitespace=False, drop_whitespace=False, break_on_hyphens=False,initial_indent='├─ ', subsequent_indent='│- ')
+	hostnameWrapper = textwrap.TextWrapper(width=line_length -1, tabsize=4, replace_whitespace=False, drop_whitespace=False, break_on_hyphens=False,initial_indent=' ', subsequent_indent='- ')
 	hostnameWrapper.wordsep_simple_re = re.compile(r'([,]+)')
+	diff_display_item_count = max(1,int(max(map(len, outputs_by_hostname.values())) * (1 - diff_display_threshold)))
+	def get_multiset_index_for_hostname(hostname):
+		index = indexes[hostname]
+		tracking_index = min(index + diff_display_item_count,len(outputs_by_hostname[hostname]))
+		tracking_iter = itertools.islice(outputs_by_hostname[hostname], tracking_index)
+		return [deque(outputs_by_hostname[hostname][index:tracking_index],maxlen=diff_display_item_count),tracking_iter]
+	# futuresChainMap = ChainMap()
+	# class futureDict(UserDict):
+	# 	def __missing__(self, key):
+	# 		value = get_multiset_index_for_hostname(key)
+	# 		self[key] = value
+	# 		# futuresChainMap.maps.append(value[0]._counter)
+	# 		return value
+	# 	# def initializeHostnames(self, hostnames):
+	# 	# 	entries = {hostname: get_multiset_index_for_hostname(hostname) for hostname in hostnames}
+	# 	# 	self.update(entries)
+	# 	# 	futuresChainMap.maps.extend(entry[0]._counter for entry in entries.values())
+	def advance(dict,key):
+		try:
+			value = dict[key]
+			value[0].append(next(value[1]))
+		except StopIteration:
+			try:
+				value[0].popleft()
+			except IndexError:
+				pass
+		except KeyError:
+			pass
+	# futures = futureDict()
+	# for hostname in merging_hostnames:
+	# 	futures[hostname]  # ensure it's initialized
+	futures = {hostname: get_multiset_index_for_hostname(hostname) for hostname in merging_hostnames}
+	currentLines = defaultdict(set)
+	color_cap = get_terminal_color_capability()
+	if color_cap == 'None':
+		green_str = ''
+		reset_str = ''
+	else:
+		green_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('green', __DEFAULT_COLOR_PALETTE['green']))
+		reset_str = '\033[0m'
+	for hostname in merging_hostnames:
+		currentLines[outputs_by_hostname[hostname][0]].add(hostname)
 	while indexes:
-		futures = {}
 		defer = False
-		sorted_working_indexes = sorted(working_indexes.items(), key=lambda x: x[1])
-		golden_hostname, golden_index = sorted_working_indexes[0]
-		buddy = {golden_hostname}
+		# sorted_working_hostnames = sorted(working_index_keys, key=lambda hn: indexes[hn])
+		golden_hostname = min(working_index_keys, key=indexes.get)
+		golden_index = indexes[golden_hostname]
 		lineToAdd = outputs_by_hostname[golden_hostname][golden_index]
-		for hostname, index in sorted_working_indexes[1:]:
-			if lineToAdd == outputs_by_hostname[hostname][index]:
-				buddy.add(hostname)
-			else:
-				if hostname not in futures:
-					diff_display_item_count = max(int(len(outputs_by_hostname[hostname]) * (1 - diff_display_threshold)),1)
-					tracking_index = min(index + diff_display_item_count,len(outputs_by_hostname[hostname]))
-					futures[hostname] = (OrderedMultiSet(outputs_by_hostname[hostname][index:tracking_index],maxlen=diff_display_item_count),tracking_index)
-				if lineToAdd in futures[hostname]:
-					for hn in buddy:
-						del working_indexes[hn]
-					defer = True
-					break
+		# for hostname, index in sorted_working_indexes[1:]:
+		# 	if lineToAdd == outputs_by_hostname[hostname][index]:
+		# 		buddy.add(hostname)
+		# 	else:
+		# 		futureLines,tracking_index = futures[hostname]
+		# 		if lineToAdd in futureLines:
+		# 			for hn in buddy:
+		# 				working_indexes.pop(hn,None)
+		# 			defer = True
+		# 			break
+		buddy = currentLines[lineToAdd].copy()
+		if len(buddy) < len(working_index_keys):
+			# we need to check the futures then
+			# thisCounter = None
+			# if golden_hostname in futures:
+			# 	thisCounter = futures[golden_hostname][0]._counter
+			# 	futuresChainMap.maps.remove(thisCounter)
+			# for hostname in working_index_keys - buddy - set(futures.keys()):
+			# 	futures[hostname] # ensure it's initialized
+			# futures.initializeHostnames(working_index_keys - buddy - futures.keys())
+			if any(lineToAdd in futures[hostname][0] for hostname in working_index_keys - buddy):
+				defer = True
+				working_index_keys -= buddy
+			# if thisCounter is not None:
+			# 	futuresChainMap.maps.append(thisCounter)
 		if not defer:
 			if buddy != previousBuddies:
 				hostnameStr = ','.join(compact_hostnames(buddy))
 				hostnameLines = hostnameWrapper.wrap(hostnameStr)
-				hostnameLines = [line.ljust(line_length - 1) + '│' for line in hostnameLines]
-				color = string_to_unique_ansi_color(hostnameStr) if len(buddy) < len(merging_hostnames) else ''
-				hostnameLines[0] = f"\033[0m{color}{hostnameLines[0]}"
+				# hostnameLines = [line.ljust(line_length) for line in hostnameLines]
+				if color_cap == 'None':
+					hostnameLines[0] = f"■{hostnameLines[0]}"
+				elif len(buddy) < len(merging_hostnames):
+					color = int_to_unique_ansi_color(hash(hostnameStr))
+					hostnameLines[0] = f"{color}■{hostnameLines[0]}"
+					hostnameLines[-1] += reset_str
+				else:
+					hostnameLines[0] = f"{green_str}■{reset_str}{hostnameLines[0]}"
 				output.extend(hostnameLines)
 				previousBuddies = buddy
-			output.append(lineToAdd.ljust(line_length - 1) + '│')
+			output.append(lineToAdd)
+			currentLines[lineToAdd].difference_update(buddy)
+			if not currentLines[lineToAdd]:
+				del currentLines[lineToAdd]
+			indexes.update(buddy)
 			for hostname in buddy:
-				indexes[hostname] += 1
-				if indexes[hostname] >= len(outputs_by_hostname[hostname]):
+				# currentLines[lineToAdd].remove(hostname)
+				# if not currentLines[lineToAdd]:
+				# 	del currentLines[lineToAdd]
+				# indexes[hostname] += 1
+				try:
+					currentLines[outputs_by_hostname[hostname][indexes[hostname]]].add(hostname)
+				except IndexError:
 					indexes.pop(hostname, None)
 					futures.pop(hostname, None)
+					# if future:
+					# 	futuresChainMap.maps.remove(future[0]._counter)
 					continue
 				#advance futures
-				if hostname in futures:
-					tracking_multiset, tracking_index = futures[hostname]
-					tracking_index += 1
-					if tracking_index < len(outputs_by_hostname[hostname]):
-						line = outputs_by_hostname[hostname][tracking_index]
-						tracking_multiset.append(line)
-					else:
-						tracking_multiset.pop_left()
-					futures[hostname] = (tracking_multiset, tracking_index)
-			working_indexes = indexes.copy()
+				advance(futures, hostname)
+			working_index_keys = set(indexes.keys())
 
 def mergeOutputs(outputs_by_hostname, merge_groups, remaining_hostnames, diff_display_threshold, line_length):
 	output = []
-	output.append(('┌'+'─'*(line_length-2) + '┐'))
+	color_cap = get_terminal_color_capability()
+	if color_cap == 'None':
+		color_line = ''
+		color_reset = ''
+		green_str = ''
+	else:
+		color_line =  rgb_to_ansi_color_string(*COLOR_PALETTE.get('white', __DEFAULT_COLOR_PALETTE['white']))
+		color_reset = '\033[0m'
+		green_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('green', __DEFAULT_COLOR_PALETTE['green']))
+	output.append(color_line+'─'*(line_length)+color_reset)
+	hostnameWrapper = textwrap.TextWrapper(width=line_length - 1, tabsize=4, replace_whitespace=False, drop_whitespace=False, break_on_hyphens=False,initial_indent=' ', subsequent_indent='- ')
+	hostnameWrapper.wordsep_simple_re = re.compile(r'([,]+)')
 	for merging_hostnames in merge_groups:
 		mergeOutput(merging_hostnames, outputs_by_hostname, output, diff_display_threshold,line_length)
-		output.append('\033[0m├'+'─'*(line_length-2) + '┤')
+		output.append(color_line+'─'*(line_length)+color_reset)
 	for hostname in remaining_hostnames:
-		hostnameLines = textwrap.wrap(hostname, width=line_length-1, tabsize=4, replace_whitespace=False, drop_whitespace=False, 
-									initial_indent='├─ ', subsequent_indent='│- ')
-		output.extend(line.ljust(line_length - 1) + '│' for line in hostnameLines)
-		output.extend(line.ljust(line_length - 1) + '│' for line in outputs_by_hostname[hostname])
-		output.append('\033[0m├'+'─'*(line_length-2) + '┤')
+		hostnameLines = hostnameWrapper.wrap(','.join(compact_hostnames([hostname])))
+		hostnameLines[0] = f"{green_str}■{color_reset}{hostnameLines[0]}"
+		output.extend(hostnameLines)
+		output.extend(outputs_by_hostname[hostname])
+		output.append(color_line+'─'*(line_length)+color_reset)
 	if output:
 		output.pop()
 	# if output and output[0] and output[0].startswith('├'):
 	# 	output[0] = '┌' + output[0][1:]
 	return output
 
+def pre_merge_hosts(hosts):
+	'''Merge hosts with identical outputs.'''
+	output_groups = defaultdict(list)
+	# Group hosts by their output identity
+	for host in hosts:
+		identity = host.get_output_hash()
+		output_groups[identity].append(host)
+	# Create merged hosts
+	merged_hosts = []
+	for group in output_groups.values():
+		group[0].name = ','.join(compact_hostnames(host.name for host in group))
+		merged_hosts.append(group[0])
+	return merged_hosts
+
 def get_host_raw_output(hosts, terminal_width):
 	outputs_by_hostname = {}
 	line_bag_by_hostname = {}
 	hostnames_by_line_bag_len = {}
-	text_wrapper = textwrap.TextWrapper(width=terminal_width - 2, tabsize=4, replace_whitespace=False, drop_whitespace=False, 
-									 initial_indent='│ ', subsequent_indent='│-')
+	text_wrapper = textwrap.TextWrapper(width=terminal_width - 1, tabsize=4, replace_whitespace=False, drop_whitespace=False, 
+									 initial_indent=' ', subsequent_indent='-')
 	max_length = 20
+	color_cap = get_terminal_color_capability()
+	if color_cap == 'None':
+		color_reset_str = ''
+		blue_str = ''
+		cyan_str = ''
+		green_str = ''
+		red_str = ''
+	else:
+		color_reset_str = '\033[0m'
+		blue_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('blue', __DEFAULT_COLOR_PALETTE['blue']))
+		cyan_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('bright_cyan', __DEFAULT_COLOR_PALETTE['bright_cyan']))
+		green_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('bright_green', __DEFAULT_COLOR_PALETTE['bright_green']))
+		red_str = rgb_to_ansi_color_string(*COLOR_PALETTE.get('bright_red', __DEFAULT_COLOR_PALETTE['bright_red']))
+	hosts = pre_merge_hosts(hosts)
 	for host in hosts:
-		hostPrintOut = ["│█ EXECUTED COMMAND:"]
-		for line in host['command'].splitlines():
+		max_length = max(max_length, len(max(host.name.split(','), key=len)) + 3)
+		hostPrintOut = [f"{cyan_str}█{color_reset_str} EXECUTED COMMAND:"]
+		for line in host.command.splitlines():
 			hostPrintOut.extend(text_wrapper.wrap(line))
-		lineBag = {(0,host['command'])}
-		prevLine = host['command']
-		if host['stdout']:
-			hostPrintOut.append('│▓ STDOUT:')
-			for line in host['stdout']:
-				hostPrintOut.extend(text_wrapper.wrap(line))
+		# hostPrintOut.extend(itertools.chain.from_iterable(text_wrapper.wrap(line) for line in host['command'].splitlines()))
+		lineBag = {(0,host.command)}
+		prevLine = host.command
+		if host.stdout:
+			hostPrintOut.append(f'{blue_str}▓{color_reset_str} STDOUT:')
+			# for line in host.stdout:
+			# 	if len(line) < terminal_width - 2:
+			# 		hostPrintOut.append(f" {line}")
+			# 	else:
+			# 		hostPrintOut.extend(text_wrapper.wrap(line))
+			hostPrintOut.extend(f" {line}" for line in host.stdout)
+			max_length = max(max_length, max(map(len, host.stdout)))
+			# hostPrintOut.extend(text_wrapper.wrap(line) for line in host.stdout)
 			lineBag.add((prevLine,1))
-			lineBag.add((1,host['stdout'][0]))
-			if len(host['stdout']) > 1:
-				lineBag.update(zip(host['stdout'], host['stdout'][1:]))
-			lineBag.update(host['stdout'])
-			prevLine = host['stdout'][-1]
-		if host['stderr']:
-			if host['stderr'][0].strip().startswith('ssh: connect to host ') and host['stderr'][0].strip().endswith('Connection refused'):
-				host['stderr'][0] = 'SSH not reachable!'
-			elif host['stderr'][-1].strip().endswith('Connection timed out'):
-				host['stderr'][-1] = 'SSH connection timed out!'
-			elif host['stderr'][-1].strip().endswith('No route to host'):
-				host['stderr'][-1] = 'Cannot find host!'
-			if host['stderr']:
-				hostPrintOut.append('│▒ STDERR:')
-				for line in host['stderr']:
-					hostPrintOut.extend(text_wrapper.wrap(line))
+			lineBag.add((1,host.stdout[0]))
+			if len(host.stdout) > 1:
+				lineBag.update(zip(host.stdout, host.stdout[1:]))
+			lineBag.update(host.stdout)
+			prevLine = host.stdout[-1]
+		if host.stderr:
+			if host.stderr[0].strip().startswith('ssh: connect to host ') and host.stderr[0].strip().endswith('Connection refused'):
+				host.stderr[0] = 'SSH not reachable!'
+			elif host.stderr[-1].strip().endswith('Connection timed out'):
+				host.stderr[-1] = 'SSH connection timed out!'
+			elif host.stderr[-1].strip().endswith('No route to host'):
+				host.stderr[-1] = 'Cannot find host!'
+			if host.stderr:
+				hostPrintOut.append(f'{red_str}▒{color_reset_str} STDERR:')
+				# for line in host.stderr:
+				# 	if len(line) < terminal_width - 2:
+				# 		hostPrintOut.append(f" {line}")
+				# 	else:
+				# 		hostPrintOut.extend(text_wrapper.wrap(line))
+				hostPrintOut.extend(f" {line}" for line in host.stderr)
+				max_length = max(max_length, max(map(len, host.stderr)))
 				lineBag.add((prevLine,2))
-				lineBag.add((2,host['stderr'][0]))
-				lineBag.update(host['stderr'])
-				if len(host['stderr']) > 1:
-					lineBag.update(zip(host['stderr'], host['stderr'][1:]))
-				prevLine = host['stderr'][-1]
-		hostPrintOut.append(f"│░ RETURN CODE: {host['returncode']}")
-		lineBag.add((prevLine,f"{host['returncode']}"))
-		max_length = max(max_length, max(map(len, hostPrintOut)))
-		outputs_by_hostname[host['name']] = hostPrintOut
-		line_bag_by_hostname[host['name']] = lineBag
-		hostnames_by_line_bag_len.setdefault(len(lineBag), set()).add(host['name'])
+				lineBag.add((2,host.stderr[0]))
+				lineBag.update(host.stderr)
+				if len(host.stderr) > 1:
+					lineBag.update(zip(host.stderr, host.stderr[1:]))
+				prevLine = host.stderr[-1]
+		if host.returncode != 0:
+			codeColor = red_str
+		else:
+			codeColor = green_str
+		hostPrintOut.append(f"{codeColor}░{color_reset_str} RETURN CODE: {host.returncode}")
+		lineBag.add((prevLine,f"{host.returncode}"))
+		outputs_by_hostname[host.name] = hostPrintOut
+		line_bag_by_hostname[host.name] = lineBag
+		hostnames_by_line_bag_len.setdefault(len(lineBag), set()).add(host.name)
 	return outputs_by_hostname, line_bag_by_hostname, hostnames_by_line_bag_len, sorted(hostnames_by_line_bag_len), min(max_length+2,terminal_width)
 
 def form_merge_groups(hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_len_keys, line_bag_by_hostname, diff_display_threshold):
 	merge_groups = []
-	for line_bag_len in hostnames_by_line_bag_len.copy():
+	remaining_hostnames = set()
+	for lbl_i, line_bag_len in enumerate(sorted_hostnames_by_line_bag_len_keys):
 		for this_hostname in hostnames_by_line_bag_len.get(line_bag_len, set()).copy():
-			if this_hostname not in hostnames_by_line_bag_len.get(line_bag_len, set()):
+			# if this_hostname not in hostnames_by_line_bag_len.get(line_bag_len, set()):
+			# 	continue
+			try:
+				this_line_bag = line_bag_by_hostname.pop(this_hostname)
+				hostnames_by_line_bag_len.get(line_bag_len, set()).discard(this_hostname)
+			except KeyError:
 				continue
-			this_line_bag = line_bag_by_hostname[this_hostname]
 			target_threshold = line_bag_len * (2 - diff_display_threshold)
 			merge_group = []
-			for other_line_bag_len in sorted_hostnames_by_line_bag_len_keys:
+			for other_line_bag_len in sorted_hostnames_by_line_bag_len_keys[lbl_i:]:
 				if other_line_bag_len > target_threshold:
 					break
-				if other_line_bag_len < line_bag_len:
-					continue
+				# if other_line_bag_len < line_bag_len:
+				# 	continue
 				for other_hostname in hostnames_by_line_bag_len.get(other_line_bag_len, set()).copy():
-					if this_hostname == other_hostname:
-						continue
 					if can_merge(this_line_bag, line_bag_by_hostname[other_hostname], diff_display_threshold):
 						merge_group.append(other_hostname)
-						hostnames_by_line_bag_len.get(line_bag_len, set()).discard(this_hostname)
 						hostnames_by_line_bag_len[other_line_bag_len].remove(other_hostname)
 						if not hostnames_by_line_bag_len[other_line_bag_len]:
 							del hostnames_by_line_bag_len[other_line_bag_len]
@@ -2816,23 +3101,28 @@ def form_merge_groups(hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_le
 			if merge_group:
 				merge_group.append(this_hostname)
 				merge_groups.append(merge_group)
-	return merge_groups
+				# del line_bag_by_hostname[this_hostname]
+			else:
+				remaining_hostnames.add(this_hostname)
+	return merge_groups, remaining_hostnames
 
 def generate_output(hosts, usejson = False, greppable = False,quiet = False,encoding = _encoding,keyPressesIn = [[]]):
+	color_cap = get_terminal_color_capability()
 	if quiet:
 		# remove hosts with returncode 0
-		hosts = [dict(host) for host in hosts if host.returncode != 0]
+		hosts = [host for host in hosts if host.returncode != 0]
 		if not hosts:
 			if usejson:
 				return '{"Success": true}'
 			else:
-				return 'Success'
-	else:
-		hosts = [dict(host) for host in hosts]
+				if color_cap == 'None':
+					return 'Success'
+				else:
+					return '\033[32mSuccess\033[0m'
 	if usejson:
 		# [print(dict(host)) for host in hosts]
 		#print(json.dumps([dict(host) for host in hosts],indent=4))
-		rtnStr = json.dumps(hosts,indent=4)
+		rtnStr = json.dumps([dict(host) for host in hosts],indent=4)
 	elif greppable:
 		# transform hosts to a 2d list
 		rtnStr = '*'*80+'\n'
@@ -2840,14 +3130,14 @@ def generate_output(hosts, usejson = False, greppable = False,quiet = False,enco
 		for host in hosts:
 			#header = f"{host['name']} | rc: {host['returncode']} | "
 			hostAdded = False
-			for line in host['stdout']:
-				rtnList.append([host['name'],f"rc: {host['returncode']}",'stdout',line])
+			for line in host.stdout:
+				rtnList.append([host.name,f"rc: {host.returncode}",'stdout',line])
 				hostAdded = True
-			for line in host['stderr']:
-				rtnList.append([host['name'],f"rc: {host['returncode']}",'stderr',line])
+			for line in host.stderr:
+				rtnList.append([host.name,f"rc: {host.returncode}",'stderr',line])
 				hostAdded = True
 			if not hostAdded:
-				rtnList.append([host['name'],f"rc: {host['returncode']}",'N/A','<EMPTY>'])
+				rtnList.append([host.name,f"rc: {host.returncode}",'N/A','<EMPTY>'])
 			rtnList.append(['','','',''])
 		rtnStr += pretty_format_table(rtnList)
 		rtnStr += '*'*80+'\n'
@@ -2863,27 +3153,32 @@ def generate_output(hosts, usejson = False, greppable = False,quiet = False,enco
 		except Exception:
 			eprint("Warning: diff_display_threshold should be a float between 0 and 1. Setting to default value of 0.9")
 			diff_display_threshold = 0.9
+		
+		color_reset_str = '' if color_cap == 'None' else '\033[0m'
+		white_str = '' if color_cap == 'None' else rgb_to_ansi_color_string(*COLOR_PALETTE.get('white', __DEFAULT_COLOR_PALETTE['white']))
 		terminal_length = get_terminal_size()[0]
 		outputs_by_hostname, line_bag_by_hostname, hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_len_keys, line_length = get_host_raw_output(hosts,terminal_length)
-		merge_groups = form_merge_groups(hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_len_keys, line_bag_by_hostname, diff_display_threshold)
-		# get the remaining hostnames in the hostnames_by_line_bag_len
-		remaining_hostnames = set()
-		for hostnames in hostnames_by_line_bag_len.values():
-			remaining_hostnames.update(hostnames)
+		merge_groups ,remaining_hostnames = form_merge_groups(hostnames_by_line_bag_len, sorted_hostnames_by_line_bag_len_keys, line_bag_by_hostname, diff_display_threshold)
 		outputs = mergeOutputs(outputs_by_hostname, merge_groups,remaining_hostnames, diff_display_threshold,line_length)
 		if keyPressesIn[-1]:
 			CMDsOut = [''.join(cmd).encode(encoding=encoding,errors='backslashreplace').decode(encoding=encoding,errors='backslashreplace').replace('\\n', '↵') for cmd in keyPressesIn if cmd]
-			outputs.append("├─ User Inputs:".ljust(line_length -1,'─')+'┤')
+			outputs.append(color_reset_str + "░ User Inputs:".ljust(line_length,'─'))
 			cmdOut = []
 			for line in CMDsOut:
 				cmdOut.extend(textwrap.wrap(line, width=line_length-1, tabsize=4, replace_whitespace=False, drop_whitespace=False, 
-									 initial_indent='│ ', subsequent_indent='│-'))
-			outputs.extend(cmd.ljust(line_length -1)+'│' for cmd in cmdOut)
+									 initial_indent=' ', subsequent_indent='-'))
+			outputs.extend(cmdOut)
 			keyPressesIn[-1].clear()
-		if quiet and not outputs:
-			rtnStr = 'Success'
+		if not outputs:
+			if quiet:
+				if color_cap == 'None':
+					return 'Success'
+				else:
+					return '\033[32mSuccess\033[0m'
+			else:
+				rtnStr = ''
 		else:
-			rtnStr = '\n'.join(outputs + [('\033[0m└'+'─'*(line_length-2)+'┘')])
+			rtnStr = '\n'.join(outputs + [white_str + '─' * (line_length) + color_reset_str])
 	return rtnStr
 
 def print_output(hosts,usejson = False,quiet = False,greppable = False):
@@ -2901,6 +3196,8 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 	global __global_suppress_printout
 	global _encoding
 	global __keyPressesIn
+	for host in hosts:
+		host.output.clear()
 	rtnStr = generate_output(hosts,usejson,greppable,quiet=__global_suppress_printout,encoding=_encoding,keyPressesIn=__keyPressesIn)
 	if not quiet:
 		print(rtnStr)
@@ -2908,8 +3205,8 @@ def print_output(hosts,usejson = False,quiet = False,greppable = False):
 
 #%% ------------ Run / Process Hosts Block ----------------
 def processRunOnHosts(timeout, password, max_connections, hosts, returnUnfinished, no_watch, json, called, greppable,
-					  unavailableHosts:dict,willUpdateUnreachableHosts,curses_min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, 
-					  curses_min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,single_window = DEFAULT_SINGLE_WINDOW,
+					  unavailableHosts:dict,willUpdateUnreachableHosts,window_width = DEFAULT_WINDOW_WIDTH, 
+					  window_height = DEFAULT_WINDOW_HEIGHT,single_window = DEFAULT_SINGLE_WINDOW,
 					  unavailable_host_expiry = DEFAULT_UNAVAILABLE_HOST_EXPIRY):
 	global __globalUnavailableHosts
 	global _no_env
@@ -2927,7 +3224,16 @@ def processRunOnHosts(timeout, password, max_connections, hosts, returnUnfinishe
 			if total_sleeped > 0.1:
 				break
 		if any([host.returncode is None for host in hosts]):
-			curses.wrapper(curses_print, hosts, threads, min_char_len = curses_min_char_len, min_line_len = curses_min_line_len, single_window = single_window)
+			try:
+				curses.wrapper(curses_print, hosts, threads, min_char_len = window_width, min_line_len = window_height, single_window = single_window)
+			except Exception:
+				try:
+					os.environ['TERM'] = 'xterm-256color'
+					curses.wrapper(curses_print, hosts, threads, min_char_len = window_width, min_line_len = window_height, single_window = single_window)
+				except Exception as e:
+					eprint(f"Curses print error: {e}")
+					import traceback
+					print(traceback.format_exc())
 	if not returnUnfinished:
 		# wait until all hosts have a return code
 		while any([host.returncode is None for host in hosts]):
@@ -3017,7 +3323,7 @@ def __formCommandArgStr(oneonone = DEFAULT_ONE_ON_ONE, timeout = DEFAULT_TIMEOUT
 						 no_env=DEFAULT_NO_ENV,greppable=DEFAULT_GREPPABLE_MODE,skip_hosts = DEFAULT_SKIP_HOSTS,
 						 file_sync = False, error_only = DEFAULT_ERROR_ONLY, identity_file = DEFAULT_IDENTITY_FILE,
 						 copy_id = False, unavailable_host_expiry = DEFAULT_UNAVAILABLE_HOST_EXPIRY, no_history = DEFAULT_NO_HISTORY,
-						 history_file = DEFAULT_HISTORY_FILE, env_file = DEFAULT_ENV_FILE,
+						 history_file = DEFAULT_HISTORY_FILE, env_file = '', env_files = DEFAULT_ENV_FILES,
 						 repeat = DEFAULT_REPEAT,interval = DEFAULT_INTERVAL,
 						 shortend = False) -> str:
 	argsList = []
@@ -3061,8 +3367,10 @@ def __formCommandArgStr(oneonone = DEFAULT_ONE_ON_ONE, timeout = DEFAULT_TIMEOUT
 		argsList.append(f'--unavailable_host_expiry={unavailable_host_expiry}' if not shortend else f'-uhe={unavailable_host_expiry}')
 	if no_env:
 		argsList.append('--no_env')
-	if env_file and env_file != DEFAULT_ENV_FILE:
+	if env_file:
 		argsList.append(f'--env_file="{env_file}"' if not shortend else f'-ef="{env_file}"')
+	if env_files:
+		argsList.extend([f'--env_files="{ef}"' for ef in env_files] if not shortend else [f'-efs="{ef}"' for ef in env_files])
 	if no_history:
 		argsList.append('--no_history' if not shortend else '-nh')
 	if history_file and history_file != DEFAULT_HISTORY_FILE:
@@ -3082,18 +3390,18 @@ def getStrCommand(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_O
 						 files = None,ipmi = DEFAULT_IPMI,interface_ip_prefix = DEFAULT_INTERFACE_IP_PREFIX,returnUnfinished = _DEFAULT_RETURN_UNFINISHED,
 						 scp=DEFAULT_SCP,gather_mode = False,username=DEFAULT_USERNAME,extraargs=DEFAULT_EXTRA_ARGS,skipUnreachable=DEFAULT_SKIP_UNREACHABLE,
 						 no_env=DEFAULT_NO_ENV,greppable=DEFAULT_GREPPABLE_MODE,willUpdateUnreachableHosts=_DEFAULT_UPDATE_UNREACHABLE_HOSTS,no_start=_DEFAULT_NO_START,
-						 skip_hosts = DEFAULT_SKIP_HOSTS, curses_min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, curses_min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,
+						 skip_hosts = DEFAULT_SKIP_HOSTS, window_width = DEFAULT_WINDOW_WIDTH, window_height = DEFAULT_WINDOW_HEIGHT,
 						 single_window = DEFAULT_SINGLE_WINDOW,file_sync = False,error_only = DEFAULT_ERROR_ONLY, identity_file = DEFAULT_IDENTITY_FILE,
 						 copy_id = False, unavailable_host_expiry = DEFAULT_UNAVAILABLE_HOST_EXPIRY,no_history = DEFAULT_NO_HISTORY,
-						 history_file = DEFAULT_HISTORY_FILE, env_file = DEFAULT_ENV_FILE,
+						 history_file = DEFAULT_HISTORY_FILE, env_file = '', env_files = [],
 						 repeat = DEFAULT_REPEAT,interval = DEFAULT_INTERVAL,
-						 shortend = False,tabSeperated = False):
+						 shortend = False,tabSeperated = False,**kwargs) -> str:
 	_ = called
 	_ = returnUnfinished
 	_ = willUpdateUnreachableHosts
 	_ = no_start
-	_ = curses_min_char_len
-	_ = curses_min_line_len
+	_ = window_width
+	_ = window_height
 	_ = single_window
 	hosts = hosts if isinstance(hosts,str) else frozenset(hosts)
 	hostStr = formHostStr(hosts)
@@ -3105,7 +3413,7 @@ def getStrCommand(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_O
 						 no_env=no_env, greppable=greppable,skip_hosts = skip_hosts, 
 						 file_sync = file_sync,error_only = error_only, identity_file = identity_file,
 						 copy_id = copy_id, unavailable_host_expiry =unavailable_host_expiry,no_history = no_history,
-						 history_file = history_file, env_file = env_file,
+						 history_file = history_file, env_file = env_file, env_files = env_files,
 						 repeat = repeat,interval = interval,
 						 shortend = shortend)
 	commands = [command.replace('"', '\\"').replace('\n', '\\n').replace('\t', '\\t') for command in format_commands(commands)]
@@ -3156,56 +3464,56 @@ def record_command_history(kwargs):
 #%% ------------ Main Block ----------------
 def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAULT_ONE_ON_ONE, timeout = DEFAULT_TIMEOUT,password = DEFAULT_PASSWORD,
 						 no_watch = DEFAULT_NO_WATCH,json = DEFAULT_JSON_MODE,called = _DEFAULT_CALLED,max_connections=DEFAULT_MAX_CONNECTIONS,
-						 files = None,ipmi = DEFAULT_IPMI,interface_ip_prefix = DEFAULT_INTERFACE_IP_PREFIX,returnUnfinished = _DEFAULT_RETURN_UNFINISHED,
+						 file = None,ipmi = DEFAULT_IPMI,interface_ip_prefix = DEFAULT_INTERFACE_IP_PREFIX,returnUnfinished = _DEFAULT_RETURN_UNFINISHED,
 						 scp=DEFAULT_SCP,gather_mode = False,username=DEFAULT_USERNAME,extraargs=DEFAULT_EXTRA_ARGS,skipUnreachable=DEFAULT_SKIP_UNREACHABLE,
 						 no_env=DEFAULT_NO_ENV,greppable=DEFAULT_GREPPABLE_MODE,willUpdateUnreachableHosts=_DEFAULT_UPDATE_UNREACHABLE_HOSTS,no_start=_DEFAULT_NO_START,
-						 skip_hosts = DEFAULT_SKIP_HOSTS, curses_min_char_len = DEFAULT_CURSES_MINIMUM_CHAR_LEN, curses_min_line_len = DEFAULT_CURSES_MINIMUM_LINE_LEN,
+						 skip_hosts = DEFAULT_SKIP_HOSTS, window_width = DEFAULT_WINDOW_WIDTH, window_height = DEFAULT_WINDOW_HEIGHT,
 						 single_window = DEFAULT_SINGLE_WINDOW,file_sync = False,error_only = DEFAULT_ERROR_ONLY,quiet = False,identity_file = DEFAULT_IDENTITY_FILE,
 						 copy_id = False, unavailable_host_expiry = DEFAULT_UNAVAILABLE_HOST_EXPIRY,no_history = True,
-						 history_file = DEFAULT_HISTORY_FILE,
+						 history_file = DEFAULT_HISTORY_FILE,**kwargs
 						 ):
-	f'''
-	Run the command on the hosts, aka multissh. main function
-
-	Args:
-		hosts (str/iterable): A string of hosts seperated by space or comma / iterable of hosts. Default to {DEFAULT_HOSTS}.
-		commands (list): A list of commands to run on the hosts. When using files, defines the destination of the files. Defaults to None.
-		oneonone (bool, optional): Whether to run the commands one on one. Defaults to {DEFAULT_ONE_ON_ONE}.
-		timeout (int, optional): The timeout for the command. Defaults to {DEFAULT_TIMEOUT}.
-		password (str, optional): The password for the hosts. Defaults to {DEFAULT_PASSWORD}.
-		no_watch (bool, optional): Whether to print the output. Defaults to {DEFAULT_NO_WATCH}.
-		json (bool, optional): Whether to print the output in JSON format. Defaults to {DEFAULT_JSON_MODE}.
-		called (bool, optional): Whether the function is called by another function. Defaults to {_DEFAULT_CALLED}.
-		max_connections (int, optional): The maximum number of concurrent SSH sessions. Defaults to 4 * os.cpu_count().
-		files (list, optional): A list of files to be copied to the hosts. Defaults to None.
-		ipmi (bool, optional): Whether to use IPMI to connect to the hosts. Defaults to {DEFAULT_IPMI}.
-		interface_ip_prefix (str, optional): The prefix of the IPMI interface. Defaults to {DEFAULT_INTERFACE_IP_PREFIX}.
-		returnUnfinished (bool, optional): Whether to return the unfinished hosts. Defaults to {_DEFAULT_RETURN_UNFINISHED}.
-		scp (bool, optional): Whether to use scp instead of rsync. Defaults to {DEFAULT_SCP}.
-		gather_mode (bool, optional): Whether to use gather mode. Defaults to False.
-		username (str, optional): The username to use to connect to the hosts. Defaults to {DEFAULT_USERNAME}.
-		extraargs (str, optional): Extra arguments to pass to the ssh / rsync / scp command. Defaults to {DEFAULT_EXTRA_ARGS}.
-		skipUnreachable (bool, optional): Whether to skip unreachable hosts. Defaults to {DEFAULT_SKIP_UNREACHABLE}.
-		no_env (bool, optional): Whether to not read the current sat system environment variables. (Will still read from files) Defaults to {DEFAULT_NO_ENV}.
-		greppable (bool, optional): Whether to print the output in greppable format. Defaults to {DEFAULT_GREPPABLE_MODE}.
-		willUpdateUnreachableHosts (bool, optional): Whether to update the global unavailable hosts. Defaults to {_DEFAULT_UPDATE_UNREACHABLE_HOSTS}.
-		no_start (bool, optional): Whether to return the hosts without starting the command. Defaults to {_DEFAULT_NO_START}.
-		skip_hosts (str, optional): The hosts to skip. Defaults to {DEFAULT_SKIP_HOSTS}.
-		min_char_len (int, optional): The minimum character per line of the curses output. Defaults to {DEFAULT_CURSES_MINIMUM_CHAR_LEN}.
-		min_line_len (int, optional): The minimum line number for each window of the curses output. Defaults to {DEFAULT_CURSES_MINIMUM_LINE_LEN}.
-		single_window (bool, optional): Whether to use a single window for the curses output. Defaults to {DEFAULT_SINGLE_WINDOW}.
-		file_sync (bool, optional): Whether to use file sync mode to sync directories. Defaults to {DEFAULT_FILE_SYNC}.
-		error_only (bool, optional): Whether to only print the error output. Defaults to {DEFAULT_ERROR_ONLY}.
-		quiet (bool, optional): Whether to suppress all verbose printout, added for compatibility, avoid using. Defaults to False.
-		identity_file (str, optional): The identity file to use for the ssh connection. Defaults to {DEFAULT_IDENTITY_FILE}.
-		copy_id (bool, optional): Whether to copy the id to the hosts. Defaults to False.
-		unavailable_host_expiry (int, optional): The time in seconds to keep the unavailable hosts in the global unavailable hosts. Defaults to {DEFAULT_UNAVAILABLE_HOST_EXPIRY}.
-		no_history (bool, optional): Whether to not save the history of the command. Defaults to True.
-		history_file (str, optional): The file to save the history of the command. Defaults to {DEFAULT_HISTORY_FILE}.
+	"""
+	Run commands on multiple hosts via SSH or IPMI.
+
+	Parameters:
+		hosts (str or iterable): Hosts to run the command on. Can be a string (comma/space-separated) or iterable. Default: DEFAULT_HOSTS.
+		commands (list or None): List of commands to run on the hosts. If files are used, defines the destination. Default: None.
+		oneonone (bool): If True, run each command on the corresponding host (1:1 mapping). Default: DEFAULT_ONE_ON_ONE.
+		timeout (int): Timeout for each command in seconds. Default: DEFAULT_TIMEOUT.
+		password (str): Password for SSH/IPMI authentication. Default: DEFAULT_PASSWORD.
+		no_watch (bool): If True, do not use curses TUI; just print output. Default: DEFAULT_NO_WATCH.
+		json (bool): If True, output results in JSON format. Default: DEFAULT_JSON_MODE.
+		called (bool): If True, function is called programmatically (not CLI). Default: _DEFAULT_CALLED.
+		max_connections (int): Maximum concurrent SSH sessions. Default: 4 * os.cpu_count().
+		file (list or None): Files to copy to hosts. Default: None.
+		ipmi (bool): Use IPMI instead of SSH. Default: DEFAULT_IPMI.
+		interface_ip_prefix (str or None): Override IP prefix for host connection. Default: DEFAULT_INTERFACE_IP_PREFIX.
+		returnUnfinished (bool): If True, return hosts even if not finished. Default: _DEFAULT_RETURN_UNFINISHED.
+		scp (bool): Use scp for file transfer (instead of rsync). Default: DEFAULT_SCP.
+		gather_mode (bool): Gather files from hosts (pull mode). Default: False.
+		username (str or None): Username for SSH/IPMI. Default: DEFAULT_USERNAME.
+		extraargs (str or list or None): Extra args for SSH/SCP/rsync. Default: DEFAULT_EXTRA_ARGS.
+		skipUnreachable (bool): Skip hosts marked as unreachable. Default: DEFAULT_SKIP_UNREACHABLE.
+		no_env (bool): Do not load environment variables from shell. Default: DEFAULT_NO_ENV.
+		greppable (bool): Output in greppable table format. Default: DEFAULT_GREPPABLE_MODE.
+		willUpdateUnreachableHosts (bool): Update global unreachable hosts file. Default: _DEFAULT_UPDATE_UNREACHABLE_HOSTS.
+		no_start (bool): If True, return Host objects without running commands. Default: _DEFAULT_NO_START.
+		skip_hosts (str or None): Hosts to skip. Default: DEFAULT_SKIP_HOSTS.
+		window_width (int): Minimum width per curses window. Default: DEFAULT_WINDOW_WIDTH.
+		window_height (int): Minimum height per curses window. Default: DEFAULT_WINDOW_HEIGHT.
+		single_window (bool): Use a single curses window for all hosts. Default: DEFAULT_SINGLE_WINDOW.
+		file_sync (bool): Enable file sync mode (sync directories). Default: DEFAULT_FILE_SYNC.
+		error_only (bool): Only print error output. Default: DEFAULT_ERROR_ONLY.
+		quiet (bool): Suppress all output (overrides other output options). Default: False.
+		identity_file (str or None): SSH identity file. Default: DEFAULT_IDENTITY_FILE.
+		copy_id (bool): Use ssh-copy-id to copy public key to hosts. Default: False.
+		unavailable_host_expiry (int): Seconds to keep hosts marked as unavailable. Default: DEFAULT_UNAVAILABLE_HOST_EXPIRY.
+		no_history (bool): Do not record command history. Default: True.
+		history_file (str): File to store command history. Default: DEFAULT_HISTORY_FILE.
 
 	Returns:
-		list: A list of Host objects
-	'''
+		list: List of Host objects representing each host/command run.
+	"""
 	global __globalUnavailableHosts
 	global __global_suppress_printout
 	global _no_env
@@ -3333,39 +3641,39 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				processRunOnHosts(timeout=timeout, password=password, max_connections=max_connections, hosts=hosts,
 					   returnUnfinished=returnUnfinished, no_watch=no_watch, json=json, called=called, greppable=greppable,
 					   unavailableHosts=unavailableHosts,willUpdateUnreachableHosts=willUpdateUnreachableHosts,
-					   curses_min_char_len = curses_min_char_len, curses_min_line_len = curses_min_line_len,
+					   window_width = window_width, window_height = window_height,
 					   single_window=single_window,unavailable_host_expiry=unavailable_host_expiry)
 		else:
 			eprint(f"Warning: ssh-copy-id not found in {_binPaths} , skipping copy id to the hosts")
 		if not commands:
 			_exit_with_code(0, "Copy id finished, no commands to run")
-	if files and not commands:
+	if file and not commands:
 		# if files are specified but not target dir, we default to file sync mode
 		file_sync = True
 	if file_sync:
 		# set the files to the union of files and commands
-		files = set(files+commands) if files else set(commands)
-	if files:
+		file = set(file+commands) if file else set(commands)
+	if file:
 		# try to resolve files first (like * etc)
 		if not gather_mode:
 			pathSet = set()
-			for file in files:
+			for file in file:
 				try:
 					pathSet.update(glob.glob(file,include_hidden=True,recursive=True))
 				except Exception:
 					pathSet.update(glob.glob(file,recursive=True))
 			if not pathSet:
-				_exit_with_code(66, f'No source files at {files!r} are found after resolving globs!')
+				_exit_with_code(66, f'No source files at {file!r} are found after resolving globs!')
 		else:
-			pathSet = set(files)
+			pathSet = set(file)
 		if file_sync:
 			# use abosolute path for file sync
 			commands = [os.path.abspath(file) for file in pathSet]
-			files = []
+			file = []
 		else:
-			files = list(pathSet)
+			file = list(pathSet)
 		if __DEBUG_MODE:
-			eprint(f"Files: {files!r}")
+			eprint(f"Files: {file!r}")
 	if oneonone:
 		hosts = []
 		if len(commands) != len(set(targetHostDic) - set(skipHostSet)):
@@ -3385,7 +3693,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 			if file_sync:
 				hosts.append(Host(host, os.path.dirname(command)+os.path.sep, files = [command],ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip = targetHostDic[host]))
 			else:
-				hosts.append(Host(host, command, files = files,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip=targetHostDic[host]))
+				hosts.append(Host(host, command, files = file,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip=targetHostDic[host]))
 			if not __global_suppress_printout: 
 				eprint(f"Running command: {command!r} on host: {host!r}")
 		if not __global_suppress_printout:
@@ -3394,7 +3702,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 			processRunOnHosts(timeout=timeout, password=password, max_connections=max_connections, hosts=hosts,
 					  returnUnfinished=returnUnfinished, no_watch=no_watch, json=json, called=called, greppable=greppable,
 					  unavailableHosts=unavailableHosts,willUpdateUnreachableHosts=willUpdateUnreachableHosts,
-					  curses_min_char_len = curses_min_char_len, curses_min_line_len = curses_min_line_len,
+					  window_width = window_width, window_height = window_height,
 					  single_window=single_window,unavailable_host_expiry=unavailable_host_expiry)
 		return hosts
 	else:
@@ -3412,10 +3720,10 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				if file_sync:
 					eprint("Error: file sync mode need to be specified with at least one path to sync.")
 					return []
-				elif files:
+				elif file:
 					eprint("Error: files need to be specified with at least one path to sync")
 				else:
-					hosts.append(Host(host, '', files = files,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,identity_file=identity_file,ip=targetHostDic[host]))
+					hosts.append(Host(host, '', files = file,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,identity_file=identity_file,ip=targetHostDic[host]))
 			if not __global_suppress_printout:
 				eprint('-'*80)
 				eprint(f"Running in interactive mode on hosts: {hostStr}" + (f"; skipping: {skipHostStr}" if skipHostStr else ''))
@@ -3426,7 +3734,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				processRunOnHosts(timeout=timeout, password=password, max_connections=max_connections, hosts=hosts,
 					   returnUnfinished=returnUnfinished, no_watch=no_watch, json=json, called=called, greppable=greppable,
 					   unavailableHosts=unavailableHosts,willUpdateUnreachableHosts=willUpdateUnreachableHosts,
-					   curses_min_char_len = curses_min_char_len, curses_min_line_len = curses_min_line_len,
+					   window_width = window_width, window_height = window_height,
 					   single_window=single_window,unavailable_host_expiry=unavailable_host_expiry)
 			return hosts
 		for command in commands:
@@ -3441,7 +3749,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				if file_sync:
 					hosts.append(Host(host, os.path.dirname(command)+os.path.sep, files = [command],ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip=targetHostDic[host]))
 				else:
-					hosts.append(Host(host, command, files = files,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip=targetHostDic[host]))
+					hosts.append(Host(host, command, files = file,ipmi=ipmi,interface_ip_prefix=interface_ip_prefix,scp=scp,extraargs=extraargs,gatherMode=gather_mode,identity_file=identity_file,ip=targetHostDic[host]))
 			if not __global_suppress_printout and len(commands) > 1:
 				eprint('-'*80)
 				eprint(f"Running command: {command} on hosts: {hostStr}" + (f"; skipping: {skipHostStr}" if skipHostStr else ''))
@@ -3450,7 +3758,7 @@ def run_command_on_hosts(hosts = DEFAULT_HOSTS,commands = None,oneonone = DEFAUL
 				processRunOnHosts(timeout=timeout, password=password, max_connections=max_connections, hosts=hosts,
 					   returnUnfinished=returnUnfinished, no_watch=no_watch, json=json, called=called, greppable=greppable,
 					   unavailableHosts=unavailableHosts,willUpdateUnreachableHosts=willUpdateUnreachableHosts,
-					   curses_min_char_len = curses_min_char_len, curses_min_line_len = curses_min_line_len,
+					   window_width = window_width, window_height = window_height,
 					   single_window=single_window,unavailable_host_expiry=unavailable_host_expiry)
 			allHosts += hosts
 		return allHosts
@@ -3472,8 +3780,8 @@ def generate_default_config(args):
 		'DEFAULT_HOSTS': args.hosts,
 		'DEFAULT_USERNAME': args.username,
 		'DEFAULT_PASSWORD': args.password,
-		'DEFAULT_IDENTITY_FILE': args.key if args.key and not os.path.isdir(args.key) else DEFAULT_IDENTITY_FILE,
-		'DEDAULT_SSH_KEY_SEARCH_PATH': args.key if args.key and os.path.isdir(args.key) else DEDAULT_SSH_KEY_SEARCH_PATH,
+		'DEFAULT_IDENTITY_FILE': args.identity_file if args.identity_file and not os.path.isdir(args.identity_file) else DEFAULT_IDENTITY_FILE,
+		'DEFAULT_SSH_KEY_SEARCH_PATH': args.identity_file if args.identity_file and os.path.isdir(args.identity_file) else DEFAULT_SSH_KEY_SEARCH_PATH,
 		'DEFAULT_USE_KEY': args.use_key,
 		'DEFAULT_EXTRA_ARGS': args.extraargs,
 		'DEFAULT_ONE_ON_ONE': args.oneonone,
@@ -3490,14 +3798,14 @@ def generate_default_config(args):
 		'DEFAULT_IPMI_USERNAME': args.ipmi_username,
 		'DEFAULT_IPMI_PASSWORD': args.ipmi_password,
 		'DEFAULT_NO_WATCH': args.no_watch,
-		'DEFAULT_CURSES_MINIMUM_CHAR_LEN': args.window_width,
-		'DEFAULT_CURSES_MINIMUM_LINE_LEN': args.window_height,
+		'DEFAULT_WINDOW_WIDTH': args.window_width,
+		'DEFAULT_WINDOW_HEIGHT': args.window_height,
 		'DEFAULT_SINGLE_WINDOW': args.single_window,
 		'DEFAULT_ERROR_ONLY': args.error_only,
 		'DEFAULT_NO_OUTPUT': args.no_output,
 		'DEFAULT_RETURN_ZERO': args.return_zero,
 		'DEFAULT_NO_ENV': args.no_env,
-		'DEFAULT_ENV_FILE': args.env_file,
+		'DEFAULT_ENV_FILES': args.env_files,
 		'DEFAULT_NO_HISTORY': args.no_history,
 		'DEFAULT_HISTORY_FILE': args.history_file,
 		'DEFAULT_MAX_CONNECTIONS': args.max_connections if args.max_connections != 4 * os.cpu_count() else None,
@@ -3554,18 +3862,18 @@ def write_default_config(args,CONFIG_FILE = None):
 #%% ------------ Argument Processing -----------------
 def get_parser():
 	global _binPaths
-	parser = argparse.ArgumentParser(description=f'Run a command on multiple hosts, Use #HOST# or #HOSTNAME# to replace the host name in the command. Config file chain: {CONFIG_FILE_CHAIN!r}',
-								  epilog=f'Found bins: {list(_binPaths.values())}\n Missing bins: {_binCalled - set(_binPaths.keys())}\n Terminal color capability: {get_terminal_color_capability()}',)
+	parser = argparse.ArgumentParser(description='Run a command on multiple hosts, Use #HOST# or #HOSTNAME# to replace the host name in the command.',
+								  epilog=f'Found bins: {list(_binPaths.values())}\n Missing bins: {_binCalled - set(_binPaths.keys())}\n Terminal color capability: {get_terminal_color_capability()}\nConfig file chain: {CONFIG_FILE_CHAIN!r}',)
 	parser.add_argument('hosts', metavar='hosts', type=str, nargs='?', help=f'Hosts to run the command on, use "," to seperate hosts. (default: {DEFAULT_HOSTS})',default=DEFAULT_HOSTS)
 	parser.add_argument('commands', metavar='commands', type=str, nargs='*',default=None,help='the command to run on the hosts / the destination of the files #HOST# or #HOSTNAME# will be replaced with the host name.')
 	parser.add_argument('-u','--username', type=str,help=f'The general username to use to connect to the hosts. Will get overwrote by individual username@host if specified. (default: {DEFAULT_USERNAME})',default=DEFAULT_USERNAME)
 	parser.add_argument('-p', '--password', type=str,help=f'The password to use to connect to the hosts, (default: {DEFAULT_PASSWORD})',default=DEFAULT_PASSWORD)
-	parser.add_argument('-k','--key','--identity',nargs='?', type=str,help=f'The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a key. Use option without value to use {DEDAULT_SSH_KEY_SEARCH_PATH} (default: {DEFAULT_IDENTITY_FILE})',const=DEDAULT_SSH_KEY_SEARCH_PATH,default=DEFAULT_IDENTITY_FILE)
+	parser.add_argument('-k','--identity_file','--key','--identity',nargs='?', type=str,help=f'The identity file to use to connect to the hosts. Implies --use_key. Specify a folder for program to search for a key. Use option without value to use {DEFAULT_SSH_KEY_SEARCH_PATH} (default: {DEFAULT_IDENTITY_FILE})',const=DEFAULT_SSH_KEY_SEARCH_PATH,default=DEFAULT_IDENTITY_FILE)
 	parser.add_argument('-uk','--use_key', action='store_true', help=f'Attempt to use public key file to connect to the hosts. (default: {DEFAULT_USE_KEY})', default=DEFAULT_USE_KEY)
 	parser.add_argument('-ea','--extraargs',type=str,help=f'Extra arguments to pass to the ssh / rsync / scp command. Put in one string for multiple arguments.Use "=" ! Ex. -ea="--delete" (default: {DEFAULT_EXTRA_ARGS})',default=DEFAULT_EXTRA_ARGS)
 	parser.add_argument("-11",'--oneonone', action='store_true', help=f"Run one corresponding command on each host. (default: {DEFAULT_ONE_ON_ONE})", default=DEFAULT_ONE_ON_ONE)
 	parser.add_argument("-f","--file", action='append', help="The file to be copied to the hosts. Use -f multiple times to copy multiple files")
-	parser.add_argument('-s','-fs','--file_sync', action='store_true', help=f'Operate in file sync mode, sync path in <COMMANDS> from this machine to <HOSTS>. Treat --file <FILE> and <COMMANDS> both as source and source and destination will be the same in this mode. Infer destination from source path. (default: {DEFAULT_FILE_SYNC})', default=DEFAULT_FILE_SYNC)
+	parser.add_argument('-s','-fs','--file_sync',nargs='?', action='append', help=f'Operate in file sync mode, sync path in <COMMANDS> from this machine to <HOSTS>. Treat --file <FILE> and <COMMANDS> both as source and source and destination will be the same in this mode. Infer destination from source path. (default: {DEFAULT_FILE_SYNC})',const=True, default=[DEFAULT_FILE_SYNC])
 	parser.add_argument('-W','--scp', action='store_true', help=f'Use scp for copying files instead of rsync. Need to use this on windows. (default: {DEFAULT_SCP})', default=DEFAULT_SCP)
 	parser.add_argument('-G','-gm','--gather_mode', action='store_true', help='Gather files from the hosts instead of sending files to the hosts. Will send remote files specified in <FILE> to local path specified in <COMMANDS>  (default: False)', default=False)
 	#parser.add_argument("-d",'-c',"--destination", type=str, help="The destination of the files. Same as specify with commands. Added for compatibility. Use #HOST# or #HOSTNAME# to replace the host name in the destination")
@@ -3578,15 +3886,16 @@ def get_parser():
 	parser.add_argument("-pre","--interface_ip_prefix", type=str, help=f"The prefix of the for the interfaces (default: {DEFAULT_INTERFACE_IP_PREFIX})", default=DEFAULT_INTERFACE_IP_PREFIX)
 	parser.add_argument('-iu','--ipmi_username', type=str,help=f'The username to use to connect to the hosts via ipmi. (default: {DEFAULT_IPMI_USERNAME})',default=DEFAULT_IPMI_USERNAME)
 	parser.add_argument('-ip','--ipmi_password', type=str,help=f'The password to use to connect to the hosts via ipmi. (default: {DEFAULT_IPMI_PASSWORD})',default=DEFAULT_IPMI_PASSWORD)
-	parser.add_argument('-S',"-q","-nw","--no_watch","--quiet", action='store_true', help=f"Quiet mode, no curses watch, only print the output. (default: {DEFAULT_NO_WATCH})", default=DEFAULT_NO_WATCH)
-	parser.add_argument("-ww",'--window_width', type=int, help=f"The minimum character length of the curses window. (default: {DEFAULT_CURSES_MINIMUM_CHAR_LEN})", default=DEFAULT_CURSES_MINIMUM_CHAR_LEN)
-	parser.add_argument("-wh",'--window_height', type=int, help=f"The minimum line height of the curses window. (default: {DEFAULT_CURSES_MINIMUM_LINE_LEN})", default=DEFAULT_CURSES_MINIMUM_LINE_LEN)
+	parser.add_argument('-S',"-q","-nw","--no_watch", action='store_true', help=f"Quiet mode, no curses watch, only print the output. (default: {DEFAULT_NO_WATCH})", default=DEFAULT_NO_WATCH)
+	parser.add_argument("-ww",'--window_width', type=int, help=f"The minimum character length of the curses window. (default: {DEFAULT_WINDOW_WIDTH})", default=DEFAULT_WINDOW_WIDTH)
+	parser.add_argument("-wh",'--window_height', type=int, help=f"The minimum line height of the curses window. (default: {DEFAULT_WINDOW_HEIGHT})", default=DEFAULT_WINDOW_HEIGHT)
 	parser.add_argument('-B','-sw','--single_window', action='store_true', help=f'Use a single window for all hosts. (default: {DEFAULT_SINGLE_WINDOW})', default=DEFAULT_SINGLE_WINDOW)
 	parser.add_argument('-R','-eo','--error_only', action='store_true', help=f'Only print the error output. (default: {DEFAULT_ERROR_ONLY})', default=DEFAULT_ERROR_ONLY)
-	parser.add_argument('-Q',"-no","--no_output", action='store_true', help=f"Do not print the output. (default: {DEFAULT_NO_OUTPUT})", default=DEFAULT_NO_OUTPUT)
+	parser.add_argument('-Q',"-no","--no_output","--quiet", action='store_true', help=f"Do not print the output. (default: {DEFAULT_NO_OUTPUT})", default=DEFAULT_NO_OUTPUT)
 	parser.add_argument('-Z','-rz','--return_zero', action='store_true', help=f"Return 0 even if there are errors. (default: {DEFAULT_RETURN_ZERO})", default=DEFAULT_RETURN_ZERO)
 	parser.add_argument('-C','--no_env', action='store_true', help=f'Do not load the command line environment variables. (default: {DEFAULT_NO_ENV})', default=DEFAULT_NO_ENV)
-	parser.add_argument("--env_file", type=str, help=f"The file to load the mssh file based environment variables from. ( Still work with --no_env ) (default: {DEFAULT_ENV_FILE})", default=DEFAULT_ENV_FILE)
+	parser.add_argument('-ef',"--env_file", type=str, help="Replace the env file look up chain with this env_file. ( Still work with --no_env ) (default: None)", default='')
+	parser.add_argument('-efs',"--env_files", action='append', help=f"The files to load the mssh file based environment variables from. Can specify multiple. Load first to last. ( Still work with --no_env ) (default: {DEFAULT_ENV_FILES})")
 	parser.add_argument("-m","--max_connections", type=int, help="Max number of connections to use (default: 4 * cpu_count)", default=DEFAULT_MAX_CONNECTIONS)
 	parser.add_argument("-j","--json", action='store_true', help=F"Output in json format. (default: {DEFAULT_JSON_MODE})", default=DEFAULT_JSON_MODE)
 	parser.add_argument('-w',"--success_hosts", action='store_true', help=f"Output the hosts that succeeded in summary as well. (default: {DEFAULT_PRINT_SUCCESS_HOSTS})", default=DEFAULT_PRINT_SUCCESS_HOSTS)
@@ -3605,8 +3914,9 @@ def get_parser():
 	parser.add_argument('-hf','--history_file', type=str, help=f'The file to store the history. (default: {DEFAULT_HISTORY_FILE})', default=DEFAULT_HISTORY_FILE)
 	parser.add_argument('--script', action='store_true', help='Run the command in script mode, short for -SCRIPT or --no_watch --skip_unreachable --no_env --no_history --greppable --error_only')
 	parser.add_argument('-e','--encoding', type=str, help=f'The encoding to use for the output. (default: {DEFAULT_ENCODING})', default=DEFAULT_ENCODING)
-	parser.add_argument('-ddt','--diff_display_threshold', type=float, help=f'The threshold of lines to display the diff when files differ. Set to 0 to always display the diff. (default: {DEFAULT_DIFF_DISPLAY_THRESHOLD})', default=DEFAULT_DIFF_DISPLAY_THRESHOLD)
+	parser.add_argument('-dt','--diff_display_threshold', type=float, help=f'The threshold of lines to display the diff when files differ. {{0-1}} Set to 0 to always display the diff. Set to 1 to disable diff. (Only merge same) (default: {DEFAULT_DIFF_DISPLAY_THRESHOLD})', default=DEFAULT_DIFF_DISPLAY_THRESHOLD)
 	parser.add_argument('--force_truecolor', action='store_true', help=f'Force truecolor output even when not in a truecolor terminal. (default: {FORCE_TRUECOLOR})', default=FORCE_TRUECOLOR)
+	parser.add_argument('--add_control_master_config', action='store_true', help='Add ControlMaster configuration to ~/.ssh/config to speed up multiple connections to the same host.')
 	parser.add_argument("-V","--version", action='version', version=f'%(prog)s {version} @ {COMMIT_DATE} with [ {", ".join(_binPaths.keys())} ] by {AUTHOR} ({AUTHOR_EMAIL})')
 	return parser
 
@@ -3636,7 +3946,18 @@ def process_args(args = None):
 		args.no_history = True
 		args.greppable = True
 		args.error_only = True
-
+	
+	if args.file_sync:
+		for path in args.file_sync:
+			if path and isinstance(path, str):
+				if args.file:
+					if path not in args.file:
+						args.file.append(path)
+				else:
+					args.file = [path]
+		args.file_sync = any(args.file_sync)
+	else:
+		args.file_sync = False
 	if args.unavailable_host_expiry <= 0:
 		eprint(f"Warning: The unavailable host expiry time {args.unavailable_host_expiry} is less than 0, setting it to 10 seconds.")
 		args.unavailable_host_expiry = 10
@@ -3655,7 +3976,7 @@ def process_config_file(args):
 		else:
 			configFileToWriteTo = args.config_file
 		write_default_config(args,configFileToWriteTo)
-		if not args.commands:
+		if not args.commands and not args.file:
 			if configFileToWriteTo:
 				with open(configFileToWriteTo,'r') as f:
 					eprint(f"Config file content: \n{f.read()}")
@@ -3687,21 +4008,50 @@ def process_commands(args):
 	return args
 
 def process_keys(args):
-	if args.key or args.use_key:
-		if not args.key:
-			args.key = find_ssh_key_file()
+	if args.identity_file or args.use_key:
+		if not args.identity_file:
+			args.identity_file = find_ssh_key_file()
 		else:
-			if os.path.isdir(os.path.expanduser(args.key)):
-				args.key = find_ssh_key_file(args.key)
-			elif not os.path.exists(args.key):
-				eprint(f"Warning: Identity file {args.key!r} not found. Passing to ssh anyway. Proceed with caution.")
+			if os.path.isdir(os.path.expanduser(args.identity_file)):
+				args.identity_file = find_ssh_key_file(args.identity_file)
+			elif not os.path.exists(args.identity_file):
+				eprint(f"Warning: Identity file {args.identity_file!r} not found. Passing to ssh anyway. Proceed with caution.")
 	return args
 
+def process_control_master_config(args):
+	global __control_master_string
+	if args.add_control_master_config:
+		try:
+			if not os.path.exists(os.path.expanduser('~/.ssh')):
+				os.makedirs(os.path.expanduser('~/.ssh'),mode=0o700)
+			ssh_config_file = os.path.expanduser('~/.ssh/config')
+			if not os.path.exists(ssh_config_file):
+				with open(ssh_config_file,'w') as f:
+					f.write(__control_master_string)
+				os.chmod(ssh_config_file,0o644)
+			else:
+				with open(ssh_config_file,'r') as f:
+					ssh_config_content = f.readlines()
+				if set(map(str.strip,ssh_config_content)).issuperset(set(map(str.strip,__control_master_string.splitlines()))):
+					eprint("ControlMaster configuration already exists in ~/.ssh/config, skipping adding:")
+					eprint(__control_master_string)
+				else:
+					with open(ssh_config_file,'a') as f:
+						f.write('\n# Added by multiSSH3.py to speed up subsequent connections\n')
+						f.write(__control_master_string)
+					eprint("ControlMaster configuration added to ~/.ssh/config.")
+		except Exception as e:
+			eprint(f"Error adding ControlMaster configuration: {e}")
+			import traceback
+			traceback.print_exc()
+		if not args.commands and not args.file:
+			_exit_with_code(0, "Done configuring ControlMaster.")
+	return args
 
 def set_global_with_args(args):
 	global _emo
 	global __ipmiiInterfaceIPPrefix
-	global _env_file
+	global _env_files
 	global __DEBUG_MODE
 	global __configs_from_file
 	global _encoding
@@ -3712,7 +4062,10 @@ def set_global_with_args(args):
 	global FORCE_TRUECOLOR
 	_emo = False
 	__ipmiiInterfaceIPPrefix = args.ipmi_interface_ip_prefix
-	_env_file = args.env_file
+	if args.env_file:
+		_env_files = [args.env_file]
+	else:
+		_env_files = DEFAULT_ENV_FILES + args.env_files if args.env_files else DEFAULT_ENV_FILES
 	__DEBUG_MODE = args.debug
 	_encoding = args.encoding
 	if args.return_zero:
@@ -3733,6 +4086,7 @@ def main():
 	args = process_config_file(args)
 	args = process_commands(args)
 	args = process_keys(args)
+	args = process_control_master_config(args)
 	set_global_with_args(args)
 	
 	if args.use_script_timeout:
@@ -3743,16 +4097,7 @@ def main():
 	if args.no_output:
 		__global_suppress_printout = True
 	if not __global_suppress_printout:
-		cmdStr = getStrCommand(args.hosts,args.commands,
-						 oneonone=args.oneonone,timeout=args.timeout,password=args.password,
-						 no_watch=args.no_watch,json=args.json,called=args.no_output,max_connections=args.max_connections,
-						 files=args.file,file_sync=args.file_sync,ipmi=args.ipmi,interface_ip_prefix=args.interface_ip_prefix,scp=args.scp,gather_mode = args.gather_mode,username=args.username,
-						 extraargs=args.extraargs,skipUnreachable=args.skip_unreachable,no_env=args.no_env,greppable=args.greppable,skip_hosts = args.skip_hosts,
-						 curses_min_char_len = args.window_width, curses_min_line_len = args.window_height,single_window=args.single_window,error_only=args.error_only,identity_file=args.key,
-						 copy_id=args.copy_id,unavailable_host_expiry=args.unavailable_host_expiry,no_history=args.no_history,
-						 history_file = args.history_file, 
-						 env_file = args.env_file,
-						 repeat = args.repeat,interval = args.interval)
+		cmdStr = getStrCommand(**vars(args))
 		eprint('> ' + cmdStr)
 	if args.error_only:
 		__global_suppress_printout = True
@@ -3764,15 +4109,7 @@ def main():
 
 		if not __global_suppress_printout: 
 			eprint(f"Running the {i+1}/{args.repeat} time") if args.repeat > 1 else None
-		hosts = run_command_on_hosts(args.hosts,args.commands,
-							 oneonone=args.oneonone,timeout=args.timeout,password=args.password,
-							 no_watch=args.no_watch,json=args.json,called=args.no_output,max_connections=args.max_connections,
-							 files=args.file,file_sync=args.file_sync,ipmi=args.ipmi,interface_ip_prefix=args.interface_ip_prefix,scp=args.scp,gather_mode = args.gather_mode,username=args.username,
-							 extraargs=args.extraargs,skipUnreachable=args.skip_unreachable,no_env=args.no_env,greppable=args.greppable,skip_hosts = args.skip_hosts,
-							 curses_min_char_len = args.window_width, curses_min_line_len = args.window_height,single_window=args.single_window,error_only=args.error_only,identity_file=args.key,
-							 copy_id=args.copy_id,unavailable_host_expiry=args.unavailable_host_expiry,no_history=args.no_history,
-							 history_file = args.history_file,
-							 )
+		hosts = run_command_on_hosts(**vars(args),called=False)
 		#print('*'*80)
 		#if not __global_suppress_printout: eprint('-'*80)
 	succeededHosts = set()