New upstream version 3.3.06-1.upstream/3.3.06-1

1 files changed, 8954 insertions, 5585 deletions

diff --git a/inxi b/inxi
index ce41381..8358388 100755
--- a/inxi
+++ b/inxi
@@ -4,8 +4,8 @@
 ##       Additional features (C) Scott Rogers - kde, cpu info
 ## Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
 ## Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
-## Jarett.Stevens - dmidecode -M patch for older systems with the /sys
-##
+## Jarett.Stevens - dmidecode -M patch for older systems without /sys machine
+## 
 ## License: GNU GPL v3 or greater
 ##
 ## You should have received a copy of the GNU General Public License
@@ -13,6 +13,8 @@
 ##
 ## If you don't understand what Free Software is, please read (or reread)
 ## this page: http://www.gnu.org/philosophy/free-sw.html
+## 
+## DEVS: NOTE: geany/scite folding is picky. Leave 1 space after # or it breaks!
 
 use strict;
 use warnings;
@@ -20,93 +22,97 @@ use warnings;
 use 5.008;
 
 ## Perl 7 things for testing: depend on Perl 5.032
-#use 5.032;
+# use 5.032;
 # use compat::perl5;  # act like Perl 5's defaults
-#no feature qw(indirect);
-#no multidimensional;
-#no bareword::filehandles;
+# no feature qw(indirect);
+# no multidimensional;
+# no bareword::filehandles;
 
 use Cwd qw(abs_path); # #abs_path realpath getcwd
 use Data::Dumper qw(Dumper); # print_r
 # NOTE: load in SystemDebugger unless encounter issues with require/import
-#use File::Find;
+# use File::Find;
 use File::stat; # needed for Xorg.0.log file mtime comparisons
 use Getopt::Long qw(GetOptions);
 # Note: default auto_abbrev is enabled
 Getopt::Long::Configure ('bundling', 'no_ignore_case', 
 'no_getopt_compat', 'no_auto_abbrev','pass_through');
-use POSIX qw(uname strftime ttyname);
-# use feature qw(state);
+use POSIX qw(ceil uname strftime ttyname);
+# use Benchmark qw(:all);_
+# use Devel::Size qw(size total_size);
+# use feature qw(say state); # 5.10 or newer Perl
+
+### INITIALIZE VARIABLES ###
 
 ## INXI INFO ##
 my $self_name='inxi';
-my $self_version='3.3.01';
-my $self_date='2021-02-08';
+my $self_version='3.3.06';
+my $self_date='2021-07-21';
 my $self_patch='00';
 ## END INXI INFO ##
 
-### INITIALIZE VARIABLES ###
+my ($b_pledge,@pledges);
+if (eval {require OpenBSD::Pledge}){
+	OpenBSD::Pledge->import();
+	$b_pledge = 1;
+	# cpath/wpath: dir/files .inxi, --debug > 9, -c 9x, -w/W; 
+	# dns/inet: ftp upload --debug > 20; exec/proc/rpath: critical; 
+	# prot_exec: Perl import; getpw: perl getpwuid() -c 9x, Net::FTP --debug > 20; 
+	# stdio: default; error: debugging pledge/perl
+	# tested. not required: mcast pf ps recvfd sendfd tmppath tty unix vminfo; 
+	# Pledge removal: OptionsHandler::post_process() [dns,inet,cpath,getpw,wpath];
+	# SelectColors::set_selection() [getpw]
+	@pledges = qw(cpath dns exec getpw inet proc prot_exec rpath wpath);
+	pledge(@pledges);
+}
 
 ## Self data
-my ($self_path, $user_config_dir, $user_config_file,$user_data_dir);
+my ($self_path,$user_config_dir,$user_config_file,$user_data_dir);
+
+## Hashes
+my (%alerts,%build_prop,%client,%colors,%disks_bsd,%dboot,%devices,%dl,
+%dmmapper,%force,%loaded,%mapper,%program_values,%rows,%sensors_raw,
+%service_tool,%show,%sysctl,%system_files,%usb);
+
+## System Arrays
+my (@app,@dmi,@gpudata,@ifs,@ifs_bsd,@paths,@ps_aux,@ps_cmd,@ps_gui,
+@sensors_exclude,@sensors_use,@uname);
+
+## Disk/Logical/Partition/RAID arrays 
+my (@btrfs_raid,@glabel,@labels,@lsblk,@lvm,@lvm_raid,@md_raid,@partitions,
+@proc_partitions,@raw_logical,@soft_raid,@swaps,@uuids,@zfs_raid);
 
 ## Debuggers
-my $debug=0;
-my (@t0,$end,$start,$fh_l,$log_file); # log file handle, file
-my ($b_hires,$t1,$t2,$t3) = (0,0,0,0);
+my %debugger = ('level' => 0);
+my (@dbg,%fake,@t0);
+my ($b_hires,$b_log,$b_log_colors,$b_log_full);
+my ($end,$start,$fh_l,$log_file); # log file handle, file
+my ($t1,$t2,$t3) = (0,0,0); # timers
+## debug / temp tools
+$debugger{'sys'} = 1;
+$client{'test-konvi'} = 0;
+
 # NOTE: redhat removed HiRes from Perl Core Modules. 
 if (eval {require Time::HiRes}){
 	Time::HiRes->import('gettimeofday','tv_interval','usleep');
 	$b_hires = 1;
 }
 @t0 = eval 'Time::HiRes::gettimeofday()' if $b_hires; # let's start it right away
-## Hashes
-my (%alerts,%build_prop,%client,%colors,%debugger,%dl,%files,
-%dmmapper,%mapper,%program_values,%rows,%sensors_raw,%system_files);
-
-## Arrays
-# ps_aux is full output, ps_cmd is only the last 10 columns to last
-my (@app,@dmesg_boot,@devices_audio,@devices_bluetooth,@devices_graphics,
-@devices_network,@devices_hwraid,@devices_timer,@dmi,@gpudata,@ifs,@ifs_bsd,
-@paths,@proc_partitions,@ps_aux,@ps_cmd,@ps_gui,@sensors_exclude,@sensors_use,
-@sysctl,@sysctl_battery,@sysctl_sensors,@sysctl_machine,@uname,@usb);
-## Disk arrays 
-my (@dm_boot_disk,@dm_boot_optical,@glabel,@gpart,@labels,@lsblk,@lvm,
-@lvm_raid,@md_raid,@partitions,@raw_logical,@sysctl_disks,@swaps,@uuids,@zfs_raid);
-my @test = (0,0,0,0,0);
-
-## Booleans
-my ($b_active_general,$b_active_lvm,
-$b_admin,$b_android,$b_arm,$b_bb_ps,$b_block_tool,$b_build_prop,
-$b_display,$b_dmesg_boot_check,$b_dmi,$b_dmidecode_force,
-$b_fake_bluetooth,$b_fake_bsd,$b_fake_cpu,$b_fake_dboot,$b_fake_dmidecode,
-$b_fake_logical,$b_fake_pciconf,$b_fake_raid,$b_fake_sensors,$b_fake_sysctl,
-$b_fake_usbdevs,$b_force_display,
-$b_gpudata,$b_hddtemp_force,$b_irc,$b_log,$b_log_colors,$b_log_full,$b_lvm,$b_lvm_data,
-$b_man,$b_mapper,$b_mdadm,$b_mem,$b_mips,
-$b_no_html_wan,$b_no_sudo,$b_pci,$b_pci_tool,$b_pkg,$b_ppc,$b_proc_partitions,
-$b_ps_gui,$b_root,$b_running_in_display,$b_sensors,$b_skip_dig,
-$b_slot_tool,$b_soc_audio,$b_soc_bluetooth,$b_soc_gfx,$b_soc_net,$b_soc_timer,$b_sparc,
-$b_swaps,$b_sysctl,$b_usb,$b_usb_check,$b_usb_sys,$b_usb_tool,
-$b_wmctrl);
-## Disk checks
-my ($b_dm_boot_disk,$b_dm_boot_optical,$b_glabel,$b_hardware_raid,
-$b_label_uuid,$b_lsblk,$b_partitions,$b_raid,$b_smartctl);
-# initialize basic use features
-my %use = (
-'sysctl_disk' => 1, # unused currently
-'update' => 1, # switched off/on with maintainer config ALLOW_UPDATE
-'weather' => 1, # switched off/on with maintainer config ALLOW_WEATHER
-);
+
+## Booleans [busybox_ps not used actively]
+my ($b_admin,$b_android,$b_arm,$b_busybox_ps,$b_display,$b_irc,
+$b_mips,$b_ppc,$b_root,$b_running_in_display,$b_sparc);
+
 ## System
 my ($bsd_type,$device_vm,$language,$os,$pci_tool,$wan_url) = ('','','','','','');
-my ($bits_sys,$cpu_arch);
+my ($bits_sys,$cpu_arch,$ppid);
 my ($cpu_sleep,$dl_timeout,$limit,$ps_cols,$ps_count) = (0.35,4,10,0,5);
 my $sensors_cpu_nu = 0;
 my ($dl_ua,$weather_source,$weather_unit) = ('s-tools/' . $self_name  . '-',100,'mi');
+
 ## Tools
-my ($display,$ftp_alt,$tty_session);
-my ($display_opt,$sudo) = ('','');
+my ($bt_tool,$display,$ftp_alt);
+my ($display_opt,$sudoas) = ('','');
 
 ## Output
 my $extra = 0;# supported values: 0-3
@@ -117,16 +123,16 @@ my $line3 = "----------------------------------------\n";
 my ($output_file,$output_type) = ('','screen');
 my $prefix = 0; # for the primiary row hash key prefix
 
-# these will assign a separator to non irc states. Important! Using ':' can 
+## Initialize internal hashes
+# these assign a separator to non irc states. Important! Using ':' can 
 # trigger stupid emoticon. Note: SEP1/SEP2 from short form not used anymore.
 # behaviors in output on IRC, so do not use those.
-my %sep = ( 
+my %sep = (
 's1-irc' => ':',
 's1-console' => ':',
 's2-irc' => '',
 's2-console' => ':',
 );
-my %show;
 #$show{'host'} = 1;
 my %size = (
 'console' => 115,
@@ -141,10 +147,10 @@ my %size = (
 'term' => 80,
 'term-lines' => 100,
 );
-
-## debug / temp tools
-$debugger{'sys'} = 1;
-$client{'test-konvi'} = 0;
+my %use = (
+'update' => 1, # switched off/on with maintainer config ALLOW_UPDATE
+'weather' => 1, # switched off/on with maintainer config ALLOW_WEATHER
+);
 
 ########################################################################
 #### STARTUP
@@ -159,20 +165,20 @@ sub main {
 	eval $start if $b_log;
 	initialize();
 	## Uncomment these two values for start client debugging
-	# $debug = 3; # 3 prints timers / 10 prints to log file
+	# $debugger{'level'} = 3; # 3 prints timers / 10 prints to log file
 	# set_debugger(); # for debugging of konvi and other start client issues
 	## legacy method
-	#my $ob_start = StartClient->new();
+	# my $ob_start = StartClient->new();
 	#$ob_start->get_client_data();
-	StartClient::get_client_data();
-	# print_line( Dumper \%client);
-	get_options();
+	StartClient::set();
+	# print_line(Dumper \%client);
+	OptionsHandler::get();
 	set_debugger(); # right after so it's set
-	check_tools();
+	CheckTools::set();
 	set_colors();
 	set_sep();
 	# print download_file('stdout','https://') . "\n";
-	generate_lines();
+	OutputGenerator::generate();
 	eval $end if $b_log;
 	cleanup();
 	# weechat's executor plugin forced me to do this, and rightfully so, 
@@ -189,153 +195,221 @@ sub initialize {
 	set_path();
 	set_user_paths();
 	set_basics();
-	system_files('set');
-	get_configs();
+	set_system_files();
+	Configs::set();
 	# set_downloader();
 	set_display_width('live');
 }
 
-sub check_tools {
-	my ($action,$program,$message,@data,%commands);
-	if ($b_dmi){
-		$action = 'use';
-		if ($program = check_program('dmidecode')) {
-			@data = grabber("$program -t chassis -t baseboard -t processor 2>&1");
-			if (scalar @data < 15){
-				if ($b_root) {
-					foreach (@data){
-						if ($_ =~ /No SMBIOS/i){
-							$action = 'smbios';
-							last;
-						}
-						elsif ($_ =~ /^\/dev\/mem: Operation/i){
-							$action = 'no-data';
-							last;
-						}
-						else {
-							$action = 'unknown-error';
-							last;
-						}
-					}
+## CheckTools
+{
+package CheckTools;
+my (%commands);
+sub set {
+	eval $start if $b_log;
+	set_commands();
+	my ($action,$program,$message,@data);
+	foreach my $test (keys %commands){
+		($action,$program) = ('use','');
+		$message = main::row_defaults('tool-present');
+		if ($commands{$test}->[1] && (
+			($commands{$test}->[1] eq 'linux' && $os ne 'linux') || 
+			($commands{$test}->[1] eq 'bsd' && $os eq 'linux'))){
+			$action = 'platform';
+		}
+		elsif ($program = main::check_program($test)){
+			# > 0 means error in shell
+			# my $cmd = "$program $commands{$test} >/dev/null";
+			# print "$cmd\n";
+			$pci_tool = $test if $test =~ /pci/;
+			if ($commands{$test}->[0] eq 'exec-sys'){
+				$action = 'permissions' if system("$program $commands{$test}->[2] >/dev/null 2>&1");
+			}
+			elsif ($commands{$test}->[0] eq 'exec-string'){
+				@data = main::grabber("$program $commands{$test}->[2] 2>&1");
+				# dmidecode errors are so specific it gets its own section
+				# also sets custom dmidecode error messages
+				if ($test eq 'dmidecode'){
+					$action = set_dmidecode(\@data) if scalar @data < 15;
 				}
-				else {
-					if (grep { $_ =~ /^\/dev\/mem: Permission/i } @data){
-						$action = 'permissions';
-					}
-					else {
-						$action = 'unknown-error';
-					}
+				elsif (grep { $_ =~ /$commands{$test}->[3]/i } @data){
+					$action = 'permissions';
 				}
 			}
 		}
 		else {
 			$action = 'missing';
 		}
-		$alerts{'dmidecode'} = {
-		'action' => $action,
-		'missing' => row_defaults('tool-missing-required','dmidecode'),
-		'permissions' => row_defaults('tool-permissions','dmidecode'),
-		'path' => $program,
-		'smbios' => row_defaults('dmidecode-smbios'),
-		'no-data' => row_defaults('dmidecode-dev-mem'),
-		'unknown-error' => row_defaults('tool-unknown-error','dmidecode'),
-		};
-	}
-	# note: gnu/linux has sysctl so it may be used that for something if present
-	# there is lspci for bsds so doesn't hurt to check it
-	if ($b_lvm || $b_pci || $b_sysctl || $show{'bluetooth'}){
-		if (!$bsd_type){
-			if ($b_pci ){
-				$commands{'lspci'} = '-n';
-			}
-			if ($b_lvm){
-				$commands{'lvs'} = '';
-			}
+		$alerts{$test}->{'action'} = $action;
+		$alerts{$test}->{'path'} = $program;
+		if ($action eq 'missing'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-missing-recommends',"$test");
 		}
-		else {
-			if ($b_pci ){
-				$commands{'pciconf'} = '-l';
-				$commands{'pcictl'} = 'list';
-				$commands{'pcidump'} = '';
+		elsif ($action eq 'permissions'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-permissions',"$test");
+		}
+		elsif ($action eq 'platform'){
+			$alerts{$test}->{'message'} = main::row_defaults('tool-missing-os', $uname[0] . " $test");
+		}
+	}
+	print Data::Dumper::Dumper \%alerts if $dbg[25];
+	set_fake_bsd_tools() if $fake{'bsd'};
+	set_forced_tools();
+	eval $end if $b_log;
+}
+sub set_dmidecode {
+	my ($data) = @_;
+	my $action = 'use';
+	if ($b_root){
+		foreach (@$data){
+			# don't need first line or scanning /dev/mem lines
+			if (/^(# dmi|Scanning)/){
+				next;
 			}
-			if ($b_sysctl ){
-				# note: there is a case of kernel.osrelease but it's a linux distro
-				$commands{'sysctl'} = 'kern.osrelease';
+			elsif ($_ =~ /No SMBIOS/i){
+				$action = 'smbios';
+				last;
 			}
-		}
-		foreach ( keys %commands ){
-			$action = 'use';
-			if ($program = check_program($_)) {
-				# > 0 means error in shell
-				#my $cmd = "$program $commands{$_} >/dev/null";
-				#print "$cmd\n";
-				$pci_tool = $_ if $_ =~ /pci/;
-				$action = 'permissions' if system("$program $commands{$_} >/dev/null 2>&1");
+			elsif ($_ =~ /^\/dev\/mem: Operation/i){
+				$action = 'no-data';
+				last;
 			}
 			else {
-				$action = 'missing';
+				$action = 'unknown-error';
+				last;
 			}
-			$alerts{$_} = {
-			'action' => $action,
-			'missing' => row_defaults('tool-missing-incomplete',"$_"),
-			'path' => $program,
-			'permissions' => row_defaults('tool-permissions',"$_"),
-			};
 		}
 	}
-	%commands = ();
+	else {
+		if (grep { $_ =~ /^\/dev\/mem: Permission/i } @$data){
+			$action = 'permissions';
+		}
+		else {
+			$action = 'unknown-error';
+		}
+	}
+	if ($action ne 'use' && $action ne 'permissions'){
+		if ($action eq 'smbios'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('dmidecode-smbios');
+		}
+		elsif ($action eq 'no-data'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('dmidecode-dev-mem');
+		}
+		elsif ($action eq 'unknown-error'){
+			$alerts{'dmidecode'}->{'message'} = main::row_defaults('tool-unknown-error','dmidecode');
+		}
+	}
+	return $action;
+}
+sub set_commands {
+	# note: gnu/linux has sysctl so it may be used that for something if present
+	# there is lspci for bsds so doesn't hurt to check it
+	if (!$bsd_type){
+		if ($use{'pci'}){
+			$commands{'lspci'} = ['exec-sys','','-n'];
+		}
+		if ($use{'logical'}){
+			$commands{'lvs'} = ['exec-sys','',''];
+		}
+	}
+	else {
+		if ($use{'pci'}){
+			$commands{'pciconf'} = ['exec-sys','','-l'];
+			$commands{'pcictl'} = ['exec-sys','',' pci0 list'];
+			$commands{'pcidump'} = ['exec-sys','',''];
+		}
+		if ($use{'sysctl'}){
+			# note: there is a case of kernel.osrelease but it's a linux distro
+			$commands{'sysctl'} = ['exec-sys','','kern.osrelease'];
+		}
+		if ($use{'bsd-partition'}){
+			$commands{'bioctl'} = ['missing','',''];
+			$commands{'disklabel'} = ['missing','',''];
+			$commands{'fdisk'} = ['missing','',''];
+			$commands{'gpart'} = ['missing','',''];
+		}
+	}
+	if ($use{'dmidecode'}){
+		$commands{'dmidecode'} = ['exec-string','','-t chassis -t baseboard -t processor',''];
+	}
+	if ($use{'usb'}){
+		# note: lsusb ships in FreeBSD ports sysutils/usbutils
+		$commands{'lsusb'} = ['missing','','',''];
+		# we want these set for various null bsd data tests
+		$commands{'usbconfig'} = ['exec-string','bsd','list','permissions'];
+		$commands{'usbdevs'} = ['missing','bsd','',''];
+	}
 	if ($show{'bluetooth'}){
-		# hangs when bluetooth service is enabled
-		# $commands{'bt-adapter'} = '-l';
-		# hangs endlessly
-		# $commands{'bluetoothctl'} = 'list';
-		$commands{'hciconfig'} = 'linux';
+		$commands{'bluetoothctl'} = ['missing','linux','',''];
+		# bt-adapter hangs when bluetooth service is disabled
+		$commands{'bt-adapter'} = ['missing','linux','',''];
+		$commands{'hciconfig'} = ['missing','linux','',''];
 	}
 	if ($show{'sensor'}){
-		$commands{'sensors'} = 'linux';
-	}
-	# note: lsusb ships in FreeBSD ports sysutils/usbutils
-	if ($b_usb){
-		$commands{'lsusb'} = 'all';
-		$commands{'usbdevs'} = 'bsd';
+		$commands{'sensors'} = ['missing','linux','',''];
 	}
 	if ($show{'ip'} || ($bsd_type && $show{'network-advanced'})){
-		$commands{'ip'} = 'linux';
-		$commands{'ifconfig'} = 'all';
+		$commands{'ip'} = ['missing','linux','',''];
+		$commands{'ifconfig'} = ['missing','','',''];
 	}
 	# can't check permissions since we need to know the partition/disc
-	if ($b_block_tool){
-		$commands{'blockdev'} = 'linux';
-		$commands{'lsblk'} = 'linux';
-	}
-	if ($b_mdadm){
-		$commands{'mdadm'} = 'linux';
-	}
-	if ($b_smartctl){
-		$commands{'smartctl'} = 'all';
-	}
-	foreach ( keys %commands ){
-		$action = 'use';
-		$program = '';
-		$message = row_defaults('tool-present');
-		if ( ($commands{$_} eq 'linux' && $os ne 'linux' ) || ($commands{$_} eq 'bsd' && $os eq 'linux' ) ){
-			$message = row_defaults('tool-missing-os', ucfirst($os) . " $_");
-			$action = 'platform';
+	if ($use{'block-tool'}){
+		$commands{'blockdev'} = ['missing','linux','',''];
+		$commands{'lsblk'} = ['missing','linux','',''];
+	}
+	if ($use{'btrfs'}){
+		$commands{'btrfs'} = ['missing','linux','',''];
+	}
+	if ($use{'mdadm'}){
+		$commands{'mdadm'} = ['missing','linux','',''];
+	}
+	if ($use{'smartctl'}){
+		$commands{'smartctl'} = ['missing','','',''];
+	}
+	if ($show{'unmounted'}){
+		$commands{'disklabel'} = ['missing','bsd','xx'];
+	}
+}
+sub set_forced_tools {
+	if ($bt_tool){
+		if ($bt_tool ne 'bluetootctl' && $alerts{'bluetoothctl'}->{'action'} eq 'use'){
+			$alerts{'bluetoothctl'}->{'action'} = 'missing';
 		}
-		elsif (!($program = check_program($_))){
-			$message = row_defaults('tool-missing-recommends',"$_");
-			$action = 'missing';
+		if ($bt_tool ne 'bt-adapter' && $alerts{'bt-adapter'}->{'action'} eq 'use'){
+			$alerts{'bt-adapter'}->{'action'} = 'missing';
+		}
+		if ($bt_tool ne 'hciconfig' && $alerts{'hciconfig'}->{'action'} eq 'use'){
+			$alerts{'hciconfig'}->{'action'} = 'missing';
 		}
-		$alerts{$_} = {
-		'action' => $action,
-		'missing' => $message,
-		'path' => $program,
-		'platform' => $message,
+	}
+}
+# only for dev/debugging BSD 
+sub set_fake_bsd_tools {
+	$system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $fake{'dboot'};
+	$alerts{'sysctl'}->{'action'} = 'use' if $fake{'sysctl'};
+	if ($fake{'pciconf'} || $fake{'pcictl'} || $fake{'pcidump'}){
+		$alerts{'pciconf'}->{'action'} = 'use' if $fake{'pciconf'};
+		$alerts{'pcictl'}->{'action'} = 'use' if $fake{'pcictl'};
+		$alerts{'pcidump'}->{'action'} = 'use' if $fake{'pcidump'};
+		$alerts{'lspci'} = {
+		'action' => 'missing',
+		'message' => 'Required program lspci not available',
+		};
+	}
+	if ($fake{'usbconfig'} || $fake{'usbdevs'}){
+		$alerts{'usbconfig'}->{'action'} = 'use' if $fake{'usbconfig'};
+		$alerts{'usbdevs'}->{'action'} = 'use' if $fake{'usbdevs'};
+		$alerts{'lsusb'} = {
+		'action' => 'missing',
+		'message' => 'Required program lsusb not available',
 		};
 	}
-	# print Dumper \%alerts;
-	set_fake_bsd_tools() if $b_fake_bsd;
+	if ($fake{'disklabel'}){
+		$alerts{'disklabel'}->{'action'} = 'use';
+	}
+}
 }
+
 # args: 1 - desktop/app command for --version; 2 - search string; 
 # 3 - space print number; 4 - [optional] version arg: -v, version, etc
 # 5 - [optional] exit first find 0/1; 6 - [optional] 0/1 stderr output
@@ -347,9 +421,9 @@ sub set_basics {
 	$ENV{'LC_ALL'}='C';
 	# remember, perl uses the opposite t/f return as shell!!!
 	# some versions of busybox do not have tty, like openwrt
-	$b_irc = ( check_program('tty') && system('tty >/dev/null') ) ? 1 : 0;
+	$b_irc = (check_program('tty') && system('tty >/dev/null')) ? 1 : 0;
 	# print "birc: $b_irc\n";
-	$b_display = ( $ENV{'DISPLAY'} ) ? 1 : 0;
+	$b_display = ($ENV{'DISPLAY'}) ? 1 : 0;
 	$b_root = $< == 0; # root UID 0, all others > 0
 	$dl{'dl'} = 'curl';
 	$dl{'curl'} = 1;
@@ -367,78 +441,67 @@ sub set_basics {
 	$colors{'default'} = 2;
 	$show{'partition-sort'} = 'id'; # sort order for partitions
 	@raw_logical = (0,0,0);
+	$ppid = getppid();
 }
 
 # args: $1 - default OR override default cols max integer count. $_[0]
 # is the display width override.
 sub set_display_width {
 	my ($width) = @_;
-	if ( $width eq 'live' ){
+	if ($width eq 'live'){
 		## sometimes tput will trigger an error (mageia) if irc client
-		if ( ! $b_irc ){
-			if ( check_program('tput') ) {
-				# trips error if use qx()...
-				chomp($size{'term'}=qx{tput cols});
-				chomp($size{'term-lines'}=qx{tput lines});
+		if (!$b_irc){
+			if (my $program = check_program('tput')){
+				# Arch urxvt: 'tput: unknown terminal "rxvt-unicode-256color"'
+				# trips error if use qx(); in FreeBSD, if you use 2>/dev/null 
+				# it makes default value 80x24, who knows why?
+				chomp($size{'term'} = qx{$program cols});
+				chomp($size{'term-lines'} = qx{$program lines});
 				$size{'term-cols'} = $size{'term'};
 			}
 			# print "tc: $size{'term'} cmc: $size{'console'}\n";
 			# double check, just in case it's missing functionality or whatever
-			if ( $size{'term'} == 0 || !is_int($size{'term'}) ){ 
+			if (!is_int($size{'term'} || $size{'term'} == 0)){ 
 				$size{'term'}=80;
 				# we'll be using this for terminal dimensions later so don't set default.
 				# $size{'term-lines'}=100;
 			}
 		}
 		# this lets you set different size for in or out of display server
-		if ( ! $b_running_in_display && $size{'no-display'} ){
-			$size{'console'}=$size{'no-display'};
+		if (!$b_running_in_display && $size{'no-display'}){
+			$size{'console'} = $size{'no-display'};
 		}
 		# term_cols is set in top globals, using tput cols
 		# print "tc: $size{'term'} cmc: $size{'console'}\n";
-		if ( $size{'term'} < $size{'console'} ){
-			$size{'console'}=$size{'term'};
+		if ($size{'term'} < $size{'console'}){
+			$size{'console'} = $size{'term'};
 		}
 		# adjust, some terminals will wrap if output cols == term cols
-		$size{'console'}=( $size{'console'} - 2 );
+		$size{'console'} = ($size{'console'} - 2);
 		# echo cmc: $size{'console'}
 		# comes after source for user set stuff
-		if ( ! $b_irc ){
-			$size{'max'}=$size{'console'};
+		if (!$b_irc){
+			$size{'max'} = $size{'console'};
 		}
 		else {
-			$size{'max'}=$size{'irc'};
+			$size{'max'} = $size{'irc'};
 		}
 	}
 	else {
-		$size{'max'}=$width;
+		$size{'max'} = $width;
 	}
 	# print "tc: $size{'term'} cmc: $size{'console'} cm: $size{'max'}\n";
 }
 
-# only for dev/debugging BSD 
-sub set_fake_bsd_tools {
-	$system_files{'dmesg-boot'} = '/var/run/dmesg.boot' if $b_fake_dboot;
-	$alerts{'pciconf'}->{'action'} = 'use' if $b_fake_pciconf;
-	$alerts{'sysctl'}->{'action'} = 'use' if $b_fake_sysctl;
-	if ($b_fake_usbdevs){
-		$alerts{'usbdevs'}->{'action'} = 'use';
-		$alerts{'lsusb'} = {
-		'action' => 'missing',
-		'missing' => 'Required program lsusb not available',
-		};
-	}
-}
-
 # NOTE: most tests internally are against !$bsd_type
 sub set_os {
 	@uname = uname();
 	$os = lc($uname[0]);
 	$cpu_arch = lc($uname[-1]);
 	if ($cpu_arch =~ /arm|aarch/){$b_arm = 1;}
-	elsif ($cpu_arch =~ /mips/) {$b_mips = 1}
-	elsif ($cpu_arch =~ /power|ppc/) {$b_ppc = 1}
-	elsif ($cpu_arch =~ /sparc/) {$b_sparc = 1}
+	elsif ($cpu_arch =~ /mips/){$b_mips = 1}
+	elsif ($cpu_arch =~ /power|ppc/){$b_ppc = 1}
+	elsif ($cpu_arch =~ /sparc/){$b_sparc = 1}
 	# aarch32 mips32 intel/amd handled in cpu
 	if ($cpu_arch =~ /(armv[1-7]|32|sparc_v9)/){
 		$bits_sys = 32;
@@ -447,8 +510,8 @@ sub set_os {
 		$bits_sys = 64;
 	}
 	$b_android = 1 if -e '/system/build.prop';
-	if ( $os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|irix|sunos|solaris|ultrix|unix)/ ){
-		if ( $os =~ /openbsd/ ){
+	if ($os =~ /(aix|bsd|cosix|dragonfly|darwin|hp-?ux|indiana|irix|sunos|solaris|ultrix|unix)/){
+		if ($os =~ /openbsd/){
 			$os = 'openbsd';
 		}
 		elsif ($os =~ /darwin/){
@@ -474,8 +537,8 @@ sub set_path {
 	@path = split(':', $ENV{'PATH'}) if $ENV{'PATH'};
 	# print "paths: @paths\nPATH: $ENV{'PATH'}\n";
 	# Create a difference of $PATH and $extra_paths and add that to $PATH:
-	foreach my $id (@path) {
-		if ( !(grep { /^$id$/ } @paths) && $id !~ /(game)/ ){
+	foreach my $id (@path){
+		if (!(grep { /^$id$/ } @paths) && $id !~ /(game)/){
 			push(@paths, $id);
 		}
 	}
@@ -483,9 +546,9 @@ sub set_path {
 }
 
 sub set_sep {
-	if ( $b_irc ){
+	if ($b_irc){
 		# too hard to read if no colors, so force that for users on irc
-		if ($colors{'scheme'} == 0 ){
+		if ($colors{'scheme'} == 0){
 			$sep{'s1'} = $sep{'s1-console'};
 			$sep{'s2'} = $sep{'s2-console'};
 		}
@@ -501,106 +564,103 @@ sub set_sep {
 }
 
 # Important: -n makes it non interactive, no prompt for password
-# only use sudo if not root, -n option requires sudo -V 1.7 or greater. 
+# only use doas/sudo if not root, -n option requires sudo -V 1.7 or greater. 
 # for some reason sudo -n with < 1.7 in Perl does not print to stderr
 # sudo will just error out which is the safest course here for now,
 # otherwise that interactive sudo password thing is too annoying
 sub set_sudo {
-	if (!$b_root && !$b_no_sudo && (my $path = check_program('sudo'))) {
-		my @data = program_data('sudo');
-		$data[1] =~ s/^([0-9]+\.[0-9]+).*/$1/;
-		#print "sudo v: $data[1]\n";
-		$sudo = "$path -n " if is_numeric($data[1]) && $data[1] >= 1.7;
+	if (!$b_root){
+		my ($path);
+		if (!$force{'no-doas'} && ($path = check_program('doas'))){
+			$sudoas = "$path -n ";
+		}
+		elsif (!$force{'no-sudo'} && ($path = check_program('sudo'))){
+			my @data = program_data('sudo');
+			$data[1] =~ s/^([0-9]+\.[0-9]+).*/$1/;
+			# print "sudo v: $data[1]\n";
+			$sudoas = "$path -n " if is_numeric($data[1]) && $data[1] >= 1.7;
+		}
+	}
+}
+
+sub set_system_files {
+	my %files = (
+	'asound-cards' => '/proc/asound/cards',
+	'asound-modules' => '/proc/asound/modules',
+	'asound-version' => '/proc/asound/version',
+	'dmesg-boot' => '/var/run/dmesg.boot',
+	'proc-cmdline' => '/proc/cmdline',
+	'proc-cpuinfo' => '/proc/cpuinfo',
+	'proc-mdstat' => '/proc/mdstat',
+	'proc-meminfo' => '/proc/meminfo',
+	'proc-modules' => '/proc/modules', # not used
+	'proc-mounts' => '/proc/mounts',# not used
+	'proc-partitions' => '/proc/partitions',
+	'proc-scsi' => '/proc/scsi/scsi',
+	'proc-version' => '/proc/version',
+	# note: 'xorg-log' is set in set_xorg_log() only if -G is triggered
+	);
+	foreach (keys %files){
+		$system_files{$_} = (-e $files{$_}) ? $files{$_} : '';
 	}
 }
 
 sub set_user_paths {
-	my ( $b_conf, $b_data );
+	my ($b_conf,$b_data);
 	# this needs to be set here because various options call the parent 
 	# initialize function directly.
 	$self_path = $0;
 	$self_path =~ s/[^\/]+$//;
 	# print "0: $0 sp: $self_path\n";
-	
-	if ( defined $ENV{'XDG_CONFIG_HOME'} && $ENV{'XDG_CONFIG_HOME'} ){
+	if (defined $ENV{'XDG_CONFIG_HOME'} && $ENV{'XDG_CONFIG_HOME'}){
 		$user_config_dir=$ENV{'XDG_CONFIG_HOME'};
 		$b_conf=1;
 	}
-	elsif ( -d "$ENV{'HOME'}/.config" ){
+	elsif (-d "$ENV{'HOME'}/.config"){
 		$user_config_dir="$ENV{'HOME'}/.config";
 		$b_conf=1;
 	}
 	else {
 		$user_config_dir="$ENV{'HOME'}/.$self_name";
 	}
-	if ( defined $ENV{'XDG_DATA_HOME'} && $ENV{'XDG_DATA_HOME'} ){
+	if (defined $ENV{'XDG_DATA_HOME'} && $ENV{'XDG_DATA_HOME'}){
 		$user_data_dir="$ENV{'XDG_DATA_HOME'}/$self_name";
 		$b_data=1;
 	}
-	elsif ( -d "$ENV{'HOME'}/.local/share" ){
+	elsif (-d "$ENV{'HOME'}/.local/share"){
 		$user_data_dir="$ENV{'HOME'}/.local/share/$self_name";
 		$b_data=1;
 	}
 	else {
 		$user_data_dir="$ENV{'HOME'}/.$self_name";
 	}
-	# note, this used to be created/checked in specific instance, but we'll just do it
-	# universally so it's done at script start.
-	if ( ! -d $user_data_dir ){
+	# note, this used to be created/checked in specific instance, but we'll just 
+	# do it universally so it's done at script start.
+	if (! -d $user_data_dir){
 		mkdir $user_data_dir;
 		# system "echo", "Made: $user_data_dir";
 	}
-	if ( $b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf" ){
-		#system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
+	if ($b_conf && -f "$ENV{'HOME'}/.$self_name/$self_name.conf"){
+		# system 'mv', "-f $ENV{'HOME'}/.$self_name/$self_name.conf", $user_config_dir;
 		# print "WOULD: Moved $self_name.conf from $ENV{'HOME'}/.$self_name to $user_config_dir\n";
 	}
-	if ( $b_data && -d "$ENV{'HOME'}/.$self_name" ){
-		#system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
-		#system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
+	if ($b_data && -d "$ENV{'HOME'}/.$self_name"){
+		# system 'mv', '-f', "$ENV{'HOME'}/.$self_name/*", $user_data_dir;
+		# system 'rm', '-Rf', "$ENV{'HOME'}/.$self_name";
 		# print "WOULD: Moved data dir $ENV{'HOME'}/.$self_name to $user_data_dir\n";
 	}
 	$log_file="$user_data_dir/$self_name.log";
-	#system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
+	# system 'echo', "$ENV{'HOME'}/.$self_name/* $user_data_dir";
 	# print "scd: $user_config_dir sdd: $user_data_dir \n";
 }
 
-# args: 1: set|hash key to return either null or path
-sub system_files {
-	my ($file) = @_;
-	if ( $file eq 'set'){
-		%files = (
-		'asound-cards' => '/proc/asound/cards',
-		'asound-modules' => '/proc/asound/modules',
-		'asound-version' => '/proc/asound/version',
-		'cmdline' => '/proc/cmdline',
-		'cpuinfo' => '/proc/cpuinfo',
-		'dmesg-boot' => '/var/run/dmesg.boot',
-		'lsb-release' => '/etc/lsb-release',
-		'mdstat' => '/proc/mdstat',
-		'meminfo' => '/proc/meminfo',
-		'modules' => '/proc/modules',
-		'mounts' => '/proc/mounts',
-		'os-release' => '/etc/os-release',
-		'partitions' => '/proc/partitions',
-		'scsi' => '/proc/scsi/scsi',
-		'version' => '/proc/version',
-		# note: 'xorg-log' is set only if -G is triggered
-		);
-		foreach ( keys %files ){
-			$system_files{$_} = ( -e $files{$_} ) ? $files{$_} : '';
-		}
-	}
-	else {
-		return $system_files{$file};
-	}
-}
 sub set_xorg_log {
 	eval $start if $b_log;
 	my (@temp,@x_logs);
 	my ($file_holder,$time_holder,$x_mtime) = ('',0,0);
 	# NOTE: other variations may be /var/run/gdm3/... but not confirmed
-	# we are just going to get all the Xorg logs we can find, and not worry about 
-	# which is 'right'.
+	# worry about we are just going to get all the Xorg logs we can find,
+	# and not which is 'right'.
 	@temp = globber('/var/log/Xorg.*.log');
 	push(@x_logs, @temp) if @temp;
 	@temp = globber('/var/lib/gdm/.local/share/xorg/Xorg.*.log');
@@ -616,18 +676,18 @@ sub set_xorg_log {
 	foreach (@x_logs){
 		if (-r $_){
 			my $src_info = File::stat::stat("$_");
-			#print "$_\n";
+			# print "$_\n";
 			if ($src_info){
 				$x_mtime = $src_info->mtime;
 				# print $_ . ": $x_time" . "\n";
-				if ($x_mtime > $time_holder ){
+				if ($x_mtime > $time_holder){
 					$time_holder = $x_mtime;
 					$file_holder = $_;
 				}
 			}
 		}
 	}
-	if ( !$file_holder && check_program('xset') ){
+	if (!$file_holder && check_program('xset')){
 		my $data = qx(xset q 2>/dev/null);
 		foreach (split('\n', $data)){
 			if ($_ =~ /Log file/i){
@@ -636,7 +696,7 @@ sub set_xorg_log {
 			}
 		}
 	}
-	print "Xorg log file: $file_holder\nLast modified: $time_holder\n" if $test[14];
+	print "Xorg log file: $file_holder\nLast modified: $time_holder\n" if $dbg[14];
 	log_data('data',"Xorg log file: $file_holder") if $b_log;
 	$system_files{'xorg-log'} = $file_holder;
 	eval $end if $b_log;
@@ -655,44 +715,44 @@ sub get_color_scheme {
 	my ($type) = @_;
 	eval $start if $b_log;
 	my @color_schemes = (
-	[qw(EMPTY EMPTY EMPTY )],
-	[qw(NORMAL NORMAL NORMAL )],
+	[qw(EMPTY EMPTY EMPTY)],
+	[qw(NORMAL NORMAL NORMAL)],
 	# for dark OR light backgrounds
 	[qw(BLUE NORMAL NORMAL)],
-	[qw(BLUE RED NORMAL )],
-	[qw(CYAN BLUE NORMAL )],
+	[qw(BLUE RED NORMAL)],
+	[qw(CYAN BLUE NORMAL)],
 	[qw(DCYAN NORMAL NORMAL)],
-	[qw(DCYAN BLUE NORMAL )],
-	[qw(DGREEN NORMAL NORMAL )],
-	[qw(DYELLOW NORMAL NORMAL )],
-	[qw(GREEN DGREEN NORMAL )],
-	[qw(GREEN NORMAL NORMAL )],
+	[qw(DCYAN BLUE NORMAL)],
+	[qw(DGREEN NORMAL NORMAL)],
+	[qw(DYELLOW NORMAL NORMAL)],
+	[qw(GREEN DGREEN NORMAL)],
+	[qw(GREEN NORMAL NORMAL)],
 	[qw(MAGENTA NORMAL NORMAL)],
 	[qw(RED NORMAL NORMAL)],
 	# for light backgrounds
 	[qw(BLACK DGREY NORMAL)],
-	[qw(DBLUE DGREY NORMAL )],
+	[qw(DBLUE DGREY NORMAL)],
 	[qw(DBLUE DMAGENTA NORMAL)],
-	[qw(DBLUE DRED NORMAL )],
+	[qw(DBLUE DRED NORMAL)],
 	[qw(DBLUE BLACK NORMAL)],
-	[qw(DGREEN DYELLOW NORMAL )],
+	[qw(DGREEN DYELLOW NORMAL)],
 	[qw(DYELLOW BLACK NORMAL)],
 	[qw(DMAGENTA BLACK NORMAL)],
 	[qw(DCYAN DBLUE NORMAL)],
 	# for dark backgrounds
 	[qw(WHITE GREY NORMAL)],
 	[qw(GREY WHITE NORMAL)],
-	[qw(CYAN GREY NORMAL )],
-	[qw(GREEN WHITE NORMAL )],
-	[qw(GREEN YELLOW NORMAL )],
-	[qw(YELLOW WHITE NORMAL )],
-	[qw(MAGENTA CYAN NORMAL )],
+	[qw(CYAN GREY NORMAL)],
+	[qw(GREEN WHITE NORMAL)],
+	[qw(GREEN YELLOW NORMAL)],
+	[qw(YELLOW WHITE NORMAL)],
+	[qw(MAGENTA CYAN NORMAL)],
 	[qw(MAGENTA YELLOW NORMAL)],
 	[qw(RED CYAN NORMAL)],
-	[qw(RED WHITE NORMAL )],
+	[qw(RED WHITE NORMAL)],
 	[qw(BLUE WHITE NORMAL)],
 	# miscellaneous
-	[qw(RED BLUE NORMAL )],
+	[qw(RED BLUE NORMAL)],
 	[qw(RED DBLUE NORMAL)],
 	[qw(BLACK BLUE NORMAL)],
 	[qw(BLACK DBLUE NORMAL)],
@@ -704,10 +764,10 @@ sub get_color_scheme {
 	[qw(MAGENTA DBLUE NORMAL)],
 	);
 	eval $end if $b_log;
-	if ($type eq 'count' ){
+	if ($type eq 'count'){
 		return scalar @color_schemes;
 	}
-	if ($type eq 'full' ){
+	if ($type eq 'full'){
 		return @color_schemes;
 	}
 	else {
@@ -720,7 +780,7 @@ sub set_color_scheme {
 	eval $start if $b_log;
 	my ($scheme) = @_;
 	$colors{'scheme'} = $scheme;
-	my $index = ( $b_irc ) ? 1 : 0; # defaults to non irc
+	my $index = ($b_irc) ? 1 : 0; # defaults to non irc
 	
 	# NOTE: qw(...) kills the escape, it is NOT the same as using 
 	# Literal "..", ".." despite docs saying it is.
@@ -759,9 +819,9 @@ sub set_colors {
 	if (exists $colors{'c1'}){
 		return 1;
 	}
-	# This let's user pick their color scheme. For IRC, only shows the color schemes, 
-	# no interactive. The override value only will be placed in user config files. 
-	# /etc/inxi.conf can also override
+	# This let's user pick their color scheme. For IRC, only shows the color 
+	# schemes, no interactive. The override value only will be placed in user 
+	# config files. /etc/inxi.conf can also override
 	if (exists $colors{'selector'}){
 		my $ob_selector = SelectColors->new($colors{'selector'});
 		$ob_selector->select_schema();
@@ -774,14 +834,14 @@ sub set_colors {
 		$color_scheme = $colors{'global'};
 	}
 	else {
-		if ( $b_irc ){
+		if ($b_irc){
 			if (defined $colors{'irc-virt-term'} && $b_display && $client{'console-irc'}){
 				$color_scheme = $colors{'irc-virt-term'};
 			}
 			elsif (defined $colors{'irc-console'} && !$b_display){
 				$color_scheme = $colors{'irc-console'};
 			}
-			elsif ( defined $colors{'irc-gui'}) {
+			elsif (defined $colors{'irc-gui'}){
 				$color_scheme = $colors{'irc-gui'};
 			}
 		}
@@ -795,7 +855,7 @@ sub set_colors {
 		}
 	}
 	# force 0 for | or > output, all others prints to irc or screen
-	if (!$b_irc && ! -t STDOUT ){
+	if (!$b_irc && ! -t STDOUT){
 		$color_scheme = 0;
 	}
 	set_color_scheme($color_scheme);
@@ -805,17 +865,10 @@ sub set_colors {
 ## SelectColors
 {
 package SelectColors;
-
-# use warnings;
-# use strict;
-# use diagnostics;
-# use 5.008;
-
 my (@data,%configs,%status);
 my ($type,$w_fh);
 my $safe_color_count = 12; # null/normal + default color group
 my $count = 0;
-
 # args: 1 - type
 sub new {
 	my $class = shift;
@@ -830,8 +883,8 @@ sub select_schema {
 	set_status();
 	start_selector();
 	create_color_selections();
-	if (! $b_irc ){
-		main::check_config_file();
+	if (!$b_irc){
+		Configs::check_file();
 		get_selection();
 	}
 	else {
@@ -877,7 +930,7 @@ sub assign_selectors {
 }
 sub start_selector {
 	my $whoami = getpwuid($<) || "unknown???";
-	if ( ! $b_irc ){
+	if (!$b_irc){
 		@data = (
 		[ 0, '', '', "Welcome to $self_name! Please select the default 
 		$configs{'selection'} color scheme."],
@@ -893,7 +946,7 @@ sub start_selector {
 	3-dark^backgrounds; 4-miscellaneous"],
 	[ 0, '', '', ""],
 	);
-	if ( ! $b_irc ){
+	if (!$b_irc){
 		push(@data, 
 		[ 0, '', '', "Please note that this will set the $configs{'selection'} 
 		preferences only for user: $whoami"],
@@ -907,12 +960,12 @@ sub start_selector {
 }
 sub create_color_selections {
 	my $spacer = '^^'; # printer removes double spaces, but replaces ^ with ' '
-	$count = ( main::get_color_scheme('count') - 1 );
-	for my $i (0 .. $count){
+	$count = (main::get_color_scheme('count') - 1);
+	foreach my $i (0 .. $count){
 		if ($i > 9){
 			$spacer = '^';
 		}
-		if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count ){
+		if ($configs{'selection'} =~ /^(global|irc-gui|irc-console|irc-virt-term)$/ && $i > $safe_color_count){
 			last;
 		}
 		main::set_color_scheme($i);
@@ -951,7 +1004,7 @@ sub get_selection {
 	@data = ();
 	my $response = <STDIN>;
 	chomp($response);
-	if (!main::is_int($response) || $response > ($count + 3) ){
+	if (!main::is_int($response) || $response > ($count + 3)){
 		@data = (
 		[0, '', '', "Error - Invalid Selection. You entered this: $response. Hit <ENTER> to continue."],
 		[0, '', '',  "$line1"],
@@ -965,11 +1018,17 @@ sub get_selection {
 	else {
 		process_selection($response);
 	}
+	if ($b_pledge){
+		@pledges = grep {$_ ne 'getpw'} @pledges;
+		OpenBSD::Pledge::pledge(@pledges);
+	}
 }
 sub process_selection {
 	my $response = shift;
-	if ($response == ($count + 3) ){
-		@data = ([0, '', '', "Ok, exiting $self_name now. You can set the colors later."],);
+	if ($response == ($count + 3)){
+		@data = (
+		[0, '', '', "Ok, exiting $self_name now. You can set the colors later."],
+		);
 		main::print_basic(\@data); 
 		exit 0;
 	}
@@ -979,10 +1038,10 @@ sub process_selection {
 		[0, '', '',  "$line1"],
 		);
 		main::print_basic(\@data); 
-		if ( defined $colors{'console'} && !$b_display ){
+		if (defined $colors{'console'} && !$b_display){
 			main::set_color_scheme($colors{'console'});
 		}
-		if ( defined $colors{'virt-term'} ){
+		if (defined $colors{'virt-term'}){
 			main::set_color_scheme($colors{'virt-term'});
 		}
 		else {
@@ -1016,9 +1075,9 @@ sub process_selection {
 }
 sub delete_all_colors {
 	my @file_lines = main::reader($user_config_file);
-	open( $w_fh, '>', $user_config_file ) or main::error_handler('open', $user_config_file, $!);
-	foreach ( @file_lines ) { 
-		if ( $_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
+	open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+	foreach (@file_lines){ 
+		if ($_ !~ /^(CONSOLE_COLOR_SCHEME|GLOBAL_COLOR_SCHEME|IRC_COLOR_SCHEME|IRC_CONS_COLOR_SCHEME|IRC_X_TERM_COLOR_SCHEME|VIRT_TERM_COLOR_SCHEME)/){
 			print {$w_fh} "$_"; 
 		}
 	} 
@@ -1026,9 +1085,9 @@ sub delete_all_colors {
 }
 sub delete_global_color {
 	my @file_lines = main::reader($user_config_file);
-	open( $w_fh, '>', $user_config_file ) or main::error_handler('open', $user_config_file, $!);
-	foreach ( @file_lines ) { 
-		if ( $_ !~ /^GLOBAL_COLOR_SCHEME/){
+	open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+	foreach (@file_lines){ 
+		if ($_ !~ /^GLOBAL_COLOR_SCHEME/){
 			print {$w_fh} "$_"; 
 		}
 	} 
@@ -1038,15 +1097,15 @@ sub set_config_color_scheme {
 	my $value = shift;
 	my @file_lines = main::reader($user_config_file);
 	my $b_found = 0;
-	open( $w_fh, '>', $user_config_file ) or main::error_handler('open', $user_config_file, $!);
-	foreach ( @file_lines ) { 
-		if ( $_ =~ /^$configs{'variable'}/ ){
+	open($w_fh, '>', $user_config_file) or main::error_handler('open', $user_config_file, $!);
+	foreach (@file_lines){ 
+		if ($_ =~ /^$configs{'variable'}/){
 			$_ = "$configs{'variable'}=$value";
 			$b_found = 1;
 		}
 		print $w_fh "$_\n";
 	}
-	if (! $b_found ){
+	if (!$b_found){
 		print $w_fh "$configs{'variable'}=$value\n";
 	}
 	close $w_fh;
@@ -1075,14 +1134,11 @@ sub print_irc_message {
 #### CONFIGS
 #### -------------------------------------------------------------------
 
-sub check_config_file {
-	$user_config_file = "$user_config_dir/$self_name.conf";
-	if ( ! -f $user_config_file ){
-		open( my $fh, '>', $user_config_file ) or error_handler('create', $user_config_file, $!);
-	}
-}
-
-sub get_configs {
+## Configs
+# public: set() check_file()
+{
+package Configs;
+sub set {
 	my ($configs) = @_;
 	my ($key, $val,@config_files);
 	if (!$configs){
@@ -1096,9 +1152,9 @@ sub get_configs {
 	}
 	# Config files should be passed in an array as a param to this function.
 	# Default intended use: global @CONFIGS;
-	foreach (@config_files) {
+	foreach (@config_files){
 		next unless open(my $fh, '<', "$_");
-		while (<$fh>) {
+		while (<$fh>){
 			chomp;
 			s/#.*//;
 			s/^\s+//;
@@ -1109,56 +1165,77 @@ sub get_configs {
 			next unless length;
 			($key, $val) = split(/\s*=\s*/, $_, 2);
 			next unless length($val);
-			get_config_item($key,$val);
+			process_item($key,$val);
 			# print "f: $file key: $key val: $val\n";
 		}
 		close $fh;
 	}
 }
-
-# note: someone managed to make a config file with corrupted values, so check int 
-# explicitly, don't assume it was done correctly.
+# note: someone managed to make a config file with corrupted values, so check
+# int explicitly, don't assume it was done correctly.
 # args: 0: key; 1: value
-sub get_config_item {
+sub process_item {
 	my ($key,$val) = @_;
-	if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE') {$use{'update'} = $val if is_int($val)}
-	elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER') {$use{'weather'} = $val if is_int($val)}
-	elsif ($key eq 'CPU_SLEEP') {$cpu_sleep = $val if is_numeric($val)}
-	elsif ($key eq 'DL_TIMEOUT') {$dl_timeout = $val if is_int($val)}
-	elsif ($key eq 'DOWNLOADER') {
+	if ($key eq 'ALLOW_UPDATE' || $key eq 'B_ALLOW_UPDATE'){
+		$use{'update'} = $val if main::is_int($val)}
+	elsif ($key eq 'ALLOW_WEATHER' || $key eq 'B_ALLOW_WEATHER'){
+		$use{'weather'} = $val if main::is_int($val)}
+	elsif ($key eq 'CPU_SLEEP'){
+		$cpu_sleep = $val if main::is_numeric($val)}
+	elsif ($key eq 'DL_TIMEOUT'){
+		$dl_timeout = $val if main::is_int($val)}
+	elsif ($key eq 'DOWNLOADER'){
 		if ($val =~ /^(curl|fetch|ftp|perl|wget)$/){
 			# this dumps all the other data and resets %dl for only the
 			# desired downloader.
-			$val = set_perl_downloader($val);
+			$val = main::set_perl_downloader($val);
 			%dl = ('dl' => $val, $val => 1);
 		}}
-	elsif ($key eq 'FILTER_STRING') {$filter_string = $val}
-	elsif ($key eq 'LANGUAGE') {$language = $val if $val =~ /^(en)$/}
-	elsif ($key eq 'LIMIT') {$limit = $val if is_int($val)}
-	elsif ($key eq 'OUTPUT_TYPE') {$output_type = $val if $val =~ /^(json|screen|xml)$/}
-	elsif ($key eq 'NO_DIG') {$b_skip_dig = $val if is_int($val)}
-	elsif ($key eq 'NO_HTML_WAN') {$b_no_html_wan = $val if is_int($val)}
-	elsif ($key eq 'NO_SUDO') {$b_no_sudo = $val if is_int($val)}
-	elsif ($key eq 'PARTITION_SORT') {$show{'partition-sort'} = $val if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/) }
-	elsif ($key eq 'PS_COUNT') {$ps_count = $val if is_int($val) }
-	elsif ($key eq 'SENSORS_CPU_NO') {$sensors_cpu_nu = $val if is_int($val)}
-	elsif ($key eq 'SENSORS_EXCLUDE') {@sensors_exclude = split(/\s*,\s*/, $val) if $val}
-	elsif ($key eq 'SENSORS_USE') {@sensors_use = split(/\s*,\s*/, $val) if $val}
-	elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST') {
-		if (is_int($val)){
+	elsif ($key eq 'FILTER_STRING'){
+		$filter_string = $val}
+	elsif ($key eq 'LANGUAGE'){
+		$language = $val if $val =~ /^(en)$/}
+	elsif ($key eq 'LIMIT'){
+		$limit = $val if main::is_int($val)}
+	elsif ($key eq 'OUTPUT_TYPE'){
+		$output_type = $val if $val =~ /^(json|screen|xml)$/}
+	elsif ($key eq 'NO_DIG'){
+		$force{'no-dig'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_DOAS'){
+		$force{'no-doas'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_HTML_WAN'){
+		$force{'no-html-wan'} = $val if main::is_int($val)}
+	elsif ($key eq 'NO_SUDO'){
+		$force{'no-sudo'} = $val if main::is_int($val)}
+	elsif ($key eq 'PARTITION_SORT'){
+		if ($val =~ /^(dev-base|fs|id|label|percent-used|size|uuid|used)$/){
+			$show{'partition-sort'} = $val;
+		}}
+	elsif ($key eq 'PS_COUNT'){
+		$ps_count = $val if main::is_int($val) }
+	elsif ($key eq 'SENSORS_CPU_NO'){
+		$sensors_cpu_nu = $val if main::is_int($val)}
+	elsif ($key eq 'SENSORS_EXCLUDE'){
+		@sensors_exclude = split(/\s*,\s*/, $val) if $val}
+	elsif ($key eq 'SENSORS_USE'){
+		@sensors_use = split(/\s*,\s*/, $val) if $val}
+	elsif ($key eq 'SHOW_HOST' || $key eq 'B_SHOW_HOST'){
+		if (main::is_int($val)){
 			$show{'host'} = $val;
 			$show{'no-host'} = 1 if !$show{'host'};
 		}
 	}
-	elsif ($key eq 'USB_SYS') {$b_usb_sys = $val if is_int($val)}
-	elsif ($key eq 'WAN_IP_URL') {
+	elsif ($key eq 'USB_SYS'){
+		$force{'usb-sys'} = $val if main::is_int($val)}
+	elsif ($key eq 'WAN_IP_URL'){
 		if ($val =~ /^(ht|f)tp[s]?:\//i){
 			$wan_url = $val;
-			$b_skip_dig = 1;
+			$force{'no-dig'} = 1;
 		}
 	}
-	elsif ($key eq 'WEATHER_SOURCE') {$weather_source = $val if is_int($val)}
-	elsif ($key eq 'WEATHER_UNIT') { 
+	elsif ($key eq 'WEATHER_SOURCE'){
+		$weather_source = $val if main::is_int($val)}
+	elsif ($key eq 'WEATHER_UNIT'){ 
 		$val = lc($val) if $val;
 		if ($val && $val =~ /^(c|f|cf|fc|i|m|im|mi)$/){
 			my %units = ('c'=>'m','f'=>'i','cf'=>'mi','fc'=>'im');
@@ -1167,26 +1244,49 @@ sub get_config_item {
 		}
 	}
 	# layout
-	elsif ($key eq 'CONSOLE_COLOR_SCHEME') {$colors{'console'} = $val if is_int($val)}
-	elsif ($key eq 'GLOBAL_COLOR_SCHEME') {$colors{'global'} = $val if is_int($val)}
-	elsif ($key eq 'IRC_COLOR_SCHEME') {$colors{'irc-gui'} = $val if is_int($val)}
-	elsif ($key eq 'IRC_CONS_COLOR_SCHEME') {$colors{'irc-console'} = $val if is_int($val)}
-	elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME') {$colors{'irc-virt-term'} = $val if is_int($val)}
-	elsif ($key eq 'VIRT_TERM_COLOR_SCHEME') {$colors{'virt-term'} = $val if is_int($val)}
+	elsif ($key eq 'CONSOLE_COLOR_SCHEME'){
+		$colors{'console'} = $val if main::is_int($val)}
+	elsif ($key eq 'GLOBAL_COLOR_SCHEME'){
+		$colors{'global'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_COLOR_SCHEME'){
+		$colors{'irc-gui'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_CONS_COLOR_SCHEME'){
+		$colors{'irc-console'} = $val if main::is_int($val)}
+	elsif ($key eq 'IRC_X_TERM_COLOR_SCHEME'){
+		$colors{'irc-virt-term'} = $val if main::is_int($val)}
+	elsif ($key eq 'VIRT_TERM_COLOR_SCHEME'){
+		$colors{'virt-term'} = $val if main::is_int($val)}
 	# note: not using the old short SEP1/SEP2
-	elsif ($key eq 'SEP1_IRC') {$sep{'s1-irc'} = $val}
-	elsif ($key eq 'SEP1_CONSOLE') {$sep{'s1-console'} = $val}
-	elsif ($key eq 'SEP2_IRC') {$sep{'s2-irc'} = $val}
-	elsif ($key eq 'SEP2_CONSOLE') {$sep{'s2-console'} = $val}
+	elsif ($key eq 'SEP1_IRC'){
+		$sep{'s1-irc'} = $val}
+	elsif ($key eq 'SEP1_CONSOLE'){
+		$sep{'s1-console'} = $val}
+	elsif ($key eq 'SEP2_IRC'){
+		$sep{'s2-irc'} = $val}
+	elsif ($key eq 'SEP2_CONSOLE'){
+		$sep{'s2-console'} = $val}
 	# size
-	elsif ($key eq 'COLS_MAX_CONSOLE') {$size{'console'} = $val if is_int($val)}
-	elsif ($key eq 'COLS_MAX_IRC') {$size{'irc'} = $val if is_int($val)}
-	elsif ($key eq 'COLS_MAX_NO_DISPLAY') {$size{'no-display'} = $val if is_int($val)}
-	elsif ($key eq 'INDENT') {$size{'indent'} = $val if is_int($val)}
-	elsif ($key eq 'WRAP_MAX' || $key eq 'INDENT_MIN') {$size{'wrap-max'} = $val if is_int($val)}
+	elsif ($key eq 'COLS_MAX_CONSOLE'){
+		$size{'console'} = $val if main::is_int($val)}
+	elsif ($key eq 'COLS_MAX_IRC'){
+		$size{'irc'} = $val if main::is_int($val)}
+	elsif ($key eq 'COLS_MAX_NO_DISPLAY'){
+		$size{'no-display'} = $val if main::is_int($val)}
+	elsif ($key eq 'INDENT'){
+		$size{'indent'} = $val if main::is_int($val)}
+	elsif ($key eq 'WRAP_MAX' || $key eq 'INDENT_MIN'){
+		$size{'wrap-max'} = $val if main::is_int($val)}
 	#  print "mc: key: $key val: $val\n";
 	# print Dumper (keys %size) . "\n";
 }
+sub check_file {
+	$user_config_file = "$user_config_dir/$self_name.conf";
+	if (! -f $user_config_file){
+		open(my $fh, '>', $user_config_file) or 
+		 main::error_handler('create', $user_config_file, $!);
+	}
+}
+}
 
 #### -------------------------------------------------------------------
 #### DEBUGGERS
@@ -1204,13 +1304,13 @@ sub begin_logging {
 	$start='main::log_data("fs", (caller(1))[3], \@_);';
 	#$t3 = tv_interval ($t0, [gettimeofday]);
 	$t3 = eval 'Time::HiRes::tv_interval (\@t0, [Time::HiRes::gettimeofday()]);' if $b_hires;
-	#print Dumper $@;
+	# print Dumper $@;
 	my $now = strftime "%Y-%m-%d %H:%M:%S", localtime;
 	return if $debugger{'timers'};
 	# do the rotation if logfile exists
-	if ( -f $log_file ){
+	if (-f $log_file){
 		# copy if present second to third
-		if ( -f $log_file_2 ){
+		if (-f $log_file_2){
 			rename $log_file_2, $log_file_3 or error_handler('rename', "$log_file_2 -> $log_file_3", "$!");
 		}
 		# then copy initial to second
@@ -1240,12 +1340,12 @@ sub begin_logging {
 # arg: $one type (fs/fe/cat/dump/raw) or logged data; 
 # [$two is function name; [$three - function args]]
 sub log_data {
-	return if ! $b_log;
+	return if !$b_log;
 	my ($one, $two, $three) = @_;
 	my ($args,$data,$timer) = ('','','');
 	my $spacer = '   ';
 	# print "1: $one 2: $two 3: $three\n";
-	if ($one eq 'fs') {
+	if ($one eq 'fs'){
 		if (ref $three eq 'ARRAY'){
 			# print Data::Dumper::Dumper $three;
 			$args = "\n${spacer}Args: " . joiner($three, '; ', 'unset');
@@ -1256,24 +1356,24 @@ sub log_data {
 		# $t1 = [gettimeofday];
 		#$t3 = tv_interval ($t0, [gettimeofday]);
 		$t3 = eval 'Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
-		#print Dumper $@;
+		# print Dumper $@;
 		$data = "Start: Function: $two$args\n${spacer}Elapsed: $t3\n";
 		$spacer='';
 		$timer = $data if $debugger{'timers'};
 	}
-	elsif ( $one eq 'fe') {
+	elsif ($one eq 'fe'){
 		# print 'timer:', Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()]),"\n";
 		#$t3 = tv_interval ($t0, [gettimeofday]);
 		eval '$t3 = Time::HiRes::tv_interval(\@t0, [Time::HiRes::gettimeofday()])' if $b_hires;
-		#print Dumper $t3;
+		# print Dumper $t3;
 		$data = "${spacer}Elapsed: $t3\nEnd: Function: $two\n";
 		$spacer='';
 		$timer = $data if $debugger{'timers'};
 	}
-	elsif ( $one eq 'cat') {
-		if ( $b_log_full ){
-			for my $file ($two){
-				my $contents = do { local( @ARGV, $/ ) = $file; <> }; # or: qx(cat $file)
+	elsif ($one eq 'cat'){
+		if ($b_log_full){
+			foreach my $file ($two){
+				my $contents = do { local(@ARGV, $/) = $file; <> }; # or: qx(cat $file)
 				$data = "$data${line3}Full file data: $file\n\n$contents\n$line3\n";
 			}
 			$spacer='';
@@ -1286,7 +1386,7 @@ sub log_data {
 	elsif ($one eq 'data'){
 		$data = "$two\n";
 	}
-	elsif ( $one eq 'dump') {
+	elsif ($one eq 'dump'){
 		$data = "$two:\n";
 		if (ref $three eq 'HASH'){
 			$data .= Data::Dumper::Dumper $three;
@@ -1301,8 +1401,8 @@ sub log_data {
 		$data .= "\n";
 		# print $data;
 	}
-	elsif ( $one eq 'raw') {
-		if ( $b_log_full ){
+	elsif ($one eq 'raw'){
+		if ($b_log_full){
 			$data = "\n${line3}Raw System Data:\n\n$two\n$line3";
 			$spacer='';
 		}
@@ -1313,7 +1413,7 @@ sub log_data {
 	if ($debugger{'timers'}){
 		print $timer if $timer;
 	}
-	#print "d: $data";
+	# print "d: $data";
 	elsif ($data){
 		print $fh_l "$spacer$data";
 	}
@@ -1321,27 +1421,27 @@ sub log_data {
 
 sub set_debugger {
 	user_debug_test_1() if $debugger{'test-1'};
-	if ( $debug >= 20){
+	if ($debugger{'level'} >= 20){
 		error_handler('not-in-irc', 'debug data generator') if $b_irc;
-		my $option = ( $debug > 22 ) ? 'main-full' : 'main';
-		$debugger{'gz'} = 1 if ($debug == 22 || $debug == 24);
+		my $option = ($debugger{'level'} > 22) ? 'main-full' : 'main';
+		$debugger{'gz'} = 1 if ($debugger{'level'} == 22 || $debugger{'level'} == 24);
 		my $ob_sys = SystemDebugger->new($option);
 		$ob_sys->run_debugger();
-		$ob_sys->upload_file($ftp_alt) if $debug > 20;
+		$ob_sys->upload_file($ftp_alt) if $debugger{'level'} > 20;
 		exit 0;
 	}
-	elsif ($debug >= 10 && $debug <= 12){
+	elsif ($debugger{'level'} >= 10 && $debugger{'level'} <= 12){
 		$b_log = 1;
-		if ($debug == 11){
+		if ($debugger{'level'} == 11){
 			$b_log_full = 1;
 		}
-		elsif ($debug == 12){
+		elsif ($debugger{'level'} == 12){
 			$b_log_colors = 1;
 		}
 		begin_logging();
 	}
-	elsif ($debug <= 3){
-		if ($debug == 3){
+	elsif ($debugger{'level'} <= 3){
+		if ($debugger{'level'} == 3){
 			$b_log = 1;
 			$debugger{'timers'} = 1;
 			begin_logging();
@@ -1352,10 +1452,10 @@ sub set_debugger {
 		}
 	}
 }
+
 ## SystemDebugger
 {
 package SystemDebugger;
-
 my $option = 'main';
 my ($data_dir,$debug_dir,$debug_gz,$parse_src,$upload) = ('','','','','');
 my @content; 
@@ -1376,9 +1476,9 @@ sub run_debugger {
 	print "Starting $self_name debugging data collector...\n";
 	print "Loading required debugger Perl File:: modules... \n";
 	# Fedora/Redhat doesn't include File::Find File::Copy in 
-	# core modules!! why? Or rather, they deliberately removed them!!
+	# core modules. why? Or rather, they deliberately removed them.
 	if (main::check_perl_module('File::Find')){
-		File::Find->import('find');
+		File::Find->import;
 	}
 	else {
 		main::error_handler('required-module', 'File', 'File::Find');
@@ -1395,6 +1495,14 @@ sub run_debugger {
 	else {
 		main::error_handler('required-module', 'File', 'File::Spec::Functions');
 	}
+	if ($debugger{'level'} > 20){
+		if (main::check_perl_module('Net::FTP')){
+			Net::FTP->import;
+		}
+		else {
+			main::error_handler('required-module', 'Net', 'Net::FTP');
+		}
+	}
 	create_debug_directory();
 	print "Note: for dmidecode, smartctl, lvm data you must be root.\n" if !$b_root;
 	print $line3;
@@ -1412,10 +1520,10 @@ sub run_debugger {
 	if (!$b_debug){
 		# note: android has unreadable /sys, but -x and -r tests pass
 		# main::globber('/sys/*') && 
-		if ( $debugger{'sys'} && main::count_dir_files('/sys') ){
+		if ($debugger{'sys'} && main::count_dir_files('/sys')){
 			build_tree('sys');
 			# kernel crash, not sure what creates it, for ppc, as root
-			sys_traverse_data() if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$b_ppc )) ; 
+			sys_traverse_data() if ($debugger{'sys'} && ($debugger{'sys-force'} || !$b_root || !$b_ppc)) ; 
 		}
 		else {
 			print "Skipping /sys data collection.\n";
@@ -1423,7 +1531,7 @@ sub run_debugger {
 		print $line3;
 		# note: proc has some files that are apparently kernel processes, I've tried 
 		# filtering them out but more keep appearing, so only run proc debugger if not root
-		if ( !$debugger{'no-proc'} && (!$b_root || $debugger{'proc'} ) && -d '/proc' && main::count_dir_files('/proc') ){
+		if (!$debugger{'no-proc'} && (!$b_root || $debugger{'proc'}) && -d '/proc' && main::count_dir_files('/proc')){
 			build_tree('proc');
 			proc_traverse_data();
 		}
@@ -1446,30 +1554,30 @@ sub create_debug_directory {
 	my ($sec,$min,$hour,$mday,$mon,$year) = localtime;
 	$year = $year+1900;
 	$mon += 1;
-	if (length($sec)  == 1) {$sec = "0$sec";}
-	if (length($min)  == 1) {$min = "0$min";}
-	if (length($hour) == 1) {$hour = "0$hour";}
-	if (length($mon)  == 1) {$mon = "0$mon";}
-	if (length($mday) == 1) {$mday = "0$mday";}
-	
+	if (length($sec)  == 1){$sec = "0$sec";}
+	if (length($min)  == 1){$min = "0$min";}
+	if (length($hour) == 1){$hour = "0$hour";}
+	if (length($mon)  == 1){$mon = "0$mon";}
+	if (length($mday) == 1){$mday = "0$mday";}
 	my $today = "$year-$mon-${mday}_$hour$min$sec";
 	# my $date = strftime "-%Y-%m-%d_", localtime;
 	if ($b_root){
 		$root_string = '-root';
 	}
 	$bsd_string = "-BSD-$bsd_type" if $bsd_type;
-	if ($b_arm ){$alt_string = '-ARM'}
-	elsif ($b_mips) {$alt_string = '-MIPS'}
-	elsif ($b_ppc) {$alt_string = '-PPC'}
-	elsif ($b_sparc) {$alt_string = '-SPARC'}
-	$debug_dir = "$self_name$alt_string$bsd_string-$host-$today$root_string-$self_version-$self_patch";
+	my $id = ($debugger{'id'}) ? '-' . $debugger{'id'}: '';
+	if ($b_arm){$alt_string = '-ARM'}
+	elsif ($b_mips){$alt_string = '-MIPS'}
+	elsif ($b_ppc){$alt_string = '-PPC'}
+	elsif ($b_sparc){$alt_string = '-SPARC'}
+	$debug_dir = "$self_name$alt_string$bsd_string-$host$id-$today$root_string-$self_version-$self_patch";
 	$debug_gz = "$debug_dir.tar.gz";
 	$data_dir = "$user_data_dir/$debug_dir";
-	if ( -d $data_dir ){
+	if (-d $data_dir){
 		unlink $data_dir or main::error_handler('remove', "$data_dir", "$!");
 	}
 	mkdir $data_dir or main::error_handler('mkdir', "$data_dir", "$!");
-	if ( -e "$user_data_dir/$debug_gz" ){
+	if (-e "$user_data_dir/$debug_gz"){
 		#rmdir "$user_data_dir$debug_gz" or main::error_handler('remove', "$user_data_dir/$debug_gz", "$!");
 		print "Failed removing leftover directory:\n$user_data_dir$debug_gz error: $?" if system('rm','-rf',"$user_data_dir$debug_gz");
 	}
@@ -1482,7 +1590,7 @@ sub compress_dir {
 	print "Removing $data_dir...\n";
 	#rmdir $data_dir or print "failed removing: $data_dir error: $!\n";
 	return 1 if !$b_delete_dir;
-	if (system('rm','-rf',$data_dir) ){
+	if (system('rm','-rf',$data_dir)){
 		print "Failed removing: $data_dir\nError: $?\n";
 	}
 	else {
@@ -1520,12 +1628,20 @@ sub bluetooth_data {
 	print "Collecting bluetooth data...\n";
 # 	no warnings 'uninitialized';
 	my @cmds = (
-	# ['bluetoothctl','list'], # do not use, hangs!!
-	# ['bt-adapter','-l'], # hangs once bluetooth service is enabled
 	['hciconfig','-a'],
-	['hcidump',''],
+	#['hcidump',''], # hangs sometimes
 	['hcitool','dev'],
+	['rfkill','--output-all'],
 	);
+	# these hang if bluetoothd not enabled
+	if (@ps_cmd && (grep {m|/bluetoothd|} @ps_cmd)){
+		push(@cmds,
+		['bt-adapter','--list'],
+		['bt-adapter','--info'],
+		['bluetoothctl','-- list'],
+		['bluetoothctl','-- show']
+		);
+	}
 	run_commands(\@cmds,'bluetooth');
 }
 
@@ -1555,6 +1671,7 @@ sub disk_data {
 	copy_files(\@files, 'disk');
 	my @cmds = (
 	['blockdev', '--report'],
+	['btrfs', 'fi show'],
 	['btrfs', 'filesystem show'],
 	['btrfs', 'filesystem show --mounted'],
 	# ['btrfs', 'filesystem show --all-devices'],
@@ -1599,8 +1716,11 @@ sub disk_data {
 	['lsblk', '-r'],
 	['lsblk', '-r --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
 	['lsblk', '-rb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+	['lsblk', '-rb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
 	['lsblk', '-Pb --output NAME,PKNAME,TYPE,RM,FSTYPE,SIZE'],
 	['lsblk', '-Pb --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS'],
+	# this should always be the live command used internally:
+	['lsblk', '-bP --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME'],
 	['lvdisplay', '-c'],
 	['lvdisplay', '-cv'],
 	['lvdisplay', '-cv --segments'],
@@ -1654,9 +1774,15 @@ sub disk_data {
 	@cmds = (
 	['atacontrol', 'list'],
 	['camcontrol', 'devlist'], 
+	['camcontrol', 'devlist -v'], 
+	['geom', 'part list'],
 	['glabel', 'status'], 
+	['gpart', 'list'], # gpart in linux/bsd but do it here again
+	['gpart', 'show'],
+	['gpart', 'status'],
 	['swapctl', '-l -k'],
 	['swapctl', '-l -k'],
+	['vmstat', ''],
 	['vmstat', '-H'],
 	);
 	run_commands(\@cmds,'disk-bsd');
@@ -1664,16 +1790,16 @@ sub disk_data {
 sub display_data {
 	my (%data,@files,@files2);
 	my $working = '';
-	if ( ! $b_display ){
+	if (!$b_display){
 		print "Warning: only some of the data collection can occur if you are not in X\n";
 		main::toucher("$data_dir/display-data-warning-user-not-in-x");
 	}
-	if ( $b_root ){
+	if ($b_root){
 		print "Warning: only some of the data collection can occur if you are running as Root user\n";
 		main::toucher("$data_dir/display-data-warning-root-user");
 	}
 	print "Collecting Xorg log and xorg.conf files...\n";
-	if ( -d "/etc/X11/xorg.conf.d/" ){
+	if (-d "/etc/X11/xorg.conf.d/"){
 		@files = main::globber("/etc/X11/xorg.conf.d/*");
 	}
 	else {
@@ -1725,9 +1851,12 @@ sub display_data {
 	['kded4','--version'],
 	['kded5','--version'],
 	['kded6','--version'],
+	['kded7','--version'],
+	['kf-config','--version'],
 	['kf4-config','--version'],
 	['kf5-config','--version'],
 	['kf6-config','--version'],
+	['kf7-config','--version'],
 	['kwin_x11','--version'],
 	# ['locate','/Xorg'], # for Xorg.wrap problem
 	['loginctl','--no-pager list-sessions'],
@@ -1784,7 +1913,7 @@ sub perl_modules {
 	foreach (@modules){
 		my $dir = $_;
 		$dir =~ s/[^\/]+$//;
-		if (!$holder || $holder ne $dir ){
+		if (!$holder || $holder ne $dir){
 			$holder = $dir;
 			$value = "DIR: $dir\n";
 			$_ =~ s/^$dir//;
@@ -1834,20 +1963,27 @@ sub system_data {
 	# bsd tools http://cb.vu/unixtoolbox.xhtml
 	my @cmds = (
 	# general
+	['sysctl', '-a'],
 	['sysctl', '-b kern.geom.conftxt'],
 	['sysctl', '-b kern.geom.confxml'],
 	['usbdevs','-v'],
 	# freebsd
+	['ofwdump','-a'], # arm / soc
+	['ofwdump','-ar'], # arm / soc
 	['pciconf','-l -cv'],
 	['pciconf','-vl'],
 	['pciconf','-l'],
+	['usbconfig','dump_device_desc'],
+	['usbconfig','list'], # needs root, sigh... why?
 	# openbsd
+	['ofctl',''], # arm / soc, need to see data sample of this
 	['pcidump',''],
 	['pcidump','-v'],
 	# netbsd
 	['kldstat',''],
-	['pcictl','list'],
-	['pcictl','list -ns'],
+	['pcictl','pci0 list'],
+	['pcictl','pci0 list -N'],
+	['pcictl','pci0 list -n'],
 	);
 	run_commands(\@cmds,'system-bsd');
 	# diskinfo -v <disk>
@@ -1912,10 +2048,10 @@ sub system_data {
 sub system_files {
 	print "Collecting system files data...\n";
 	my (%data,@files,@files2);
-	@files = RepoData::get($data_dir);
+	@files = RepoItem::get($data_dir);
 	copy_files(\@files, 'repo');
 	# chdir "/etc";
-	@files = main::globber('/etc/*[-_s[rR]elease,[vV]ersion,issue}*');
+	@files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
 	push(@files, '/etc/issue');
 	push(@files, '/etc/lsb-release');
 	push(@files, '/etc/os-release');
@@ -1974,7 +2110,7 @@ sub copy_files {
 	my ($absent,$error,$good,$name,$unreadable);
 	my $directory = ($alt_dir) ? $alt_dir : $data_dir;
 	my $working = ($type ne 'proc') ? "$type-file-": '';
-	foreach (@$files_ref) {
+	foreach (@$files_ref){
 		$name = $_;
 		$name =~ s/^\///;
 		$name =~ s/\//~/g;
@@ -1985,7 +2121,7 @@ sub copy_files {
 		$error = $name . '-error';
 		$unreadable = $name . '-unreadable';
 		# proc have already been tested for readable/exists
-		if ($type eq 'proc' || -e $_ ) {
+		if ($type eq 'proc' || -e $_){
 			print "F:$_\n" if $type eq 'proc' && $debugger{'proc-print'};
 			if ($type eq 'proc' || -r $_){
 				copy($_,"$good") or main::toucher($error);
@@ -2032,14 +2168,14 @@ sub run_commands {
 sub write_data {
 	my ($data_ref, $type) = @_;
 	my ($empty,$error,$fh,$good,$name,$undefined,$value);
-	foreach (keys %$data_ref) {
+	foreach (keys %$data_ref){
 		$value = $data_ref->{$_};
 		$name = "$data_dir/$type-data-$_";
 		$good = $name . '.txt';
 		$empty = $name . '-empty';
 		$error = $name . '-error';
 		$undefined = $name . '-undefined';
-		if (defined $value) {
+		if (defined $value){
 			if ($value || $value eq '0'){
 				open($fh, '>', $good) or main::toucher($error);
 				print $fh "$value";
@@ -2056,7 +2192,7 @@ sub write_data {
 ## TOOLS FOR DIRECTORY TREE/LS/TRAVERSE; UPLOADER
 sub build_tree {
 	my ($which) = @_;
-	if ( $which eq 'sys' && main::check_program('tree') ){
+	if ($which eq 'sys' && main::check_program('tree')){
 		print "Constructing /$which tree data...\n";
 		my $dirname = '/sys';
 		my $cmd;
@@ -2067,7 +2203,7 @@ sub build_tree {
 		foreach (@files){
 			next if /^\./;
 			$cmd = "tree -a -L 10 $dirname/$_ > $data_dir/sys-data-tree-$_-10.txt";
-			#print "$cmd\n";
+			# print "$cmd\n";
 			system($cmd);
 		}
 	}
@@ -2078,7 +2214,7 @@ sub build_tree {
 		directory_ls($which,3);
 		directory_ls($which,4);
 	}
-	elsif ($which eq 'proc') {
+	elsif ($which eq 'proc'){
 		directory_ls('proc',1);
 		directory_ls('proc',2,'[a-z]');
 		# don't want the /proc/self or /proc/thread-self directories, those are 
@@ -2090,31 +2226,31 @@ sub build_tree {
 
 # include is basic regex for ls path syntax, like [a-z]
 sub directory_ls {
-	my ( $dir,$depth,$include) = @_;
+	my ($dir,$depth,$include) = @_;
 	$include ||= '';
 	my ($exclude) = ('');
 	# wd do NOT want to see anything in self or thread-self!!
 	# $exclude = 'I self -I thread-self' if $dir eq 'proc';
 	my $cmd = do {
-		if ( $depth == 1 ){ "ls -l $exclude /$dir/$include 2>/dev/null" }
-		elsif ( $depth == 2 ){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
-		elsif ( $depth == 3 ){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
-		elsif ( $depth == 4 ){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
-		elsif ( $depth == 5 ){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
-		elsif ( $depth == 6 ){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
+		if ($depth == 1){ "ls -l $exclude /$dir/$include 2>/dev/null" }
+		elsif ($depth == 2){ "ls -l $exclude /$dir/$include*/ 2>/dev/null" }
+		elsif ($depth == 3){ "ls -l $exclude /$dir/$include*/*/ 2>/dev/null" }
+		elsif ($depth == 4){ "ls -l $exclude /$dir/$include*/*/*/ 2>/dev/null" }
+		elsif ($depth == 5){ "ls -l $exclude /$dir/$include*/*/*/*/ 2>/dev/null" }
+		elsif ($depth == 6){ "ls -l $exclude /$dir/$include*/*/*/*/*/ 2>/dev/null" }
 	};
 	my @working;
 	my $output = '';
 	my ($type);
 	my $result = qx($cmd);
 	open(my $ch, '<', \$result) or main::error_handler('open-data',"$cmd", "$!");
-	while ( my $line = <$ch> ){
+	while (my $line = <$ch>){
 		chomp($line);
 		$line =~ s/^\s+|\s+$//g;
 		@working = split(/\s+/, $line);
 		$working[0] ||= '';
-		if ( scalar @working > 7 ){
-			if ($working[0] =~ /^d/ ){
+		if (scalar @working > 7){
+			if ($working[0] =~ /^d/){
 				$type = "d - ";
 			}
 			elsif ($working[0] =~ /^l/){
@@ -2127,7 +2263,7 @@ sub directory_ls {
 			$working[10] ||= '';
 			$output = $output . "  $type$working[8] $working[9] $working[10]\n";
 		}
-		elsif ( $working[0] !~ /^total/ ){
+		elsif ($working[0] !~ /^total/){
 			$output = $output . $line . "\n";
 		}
 	}
@@ -2182,7 +2318,7 @@ sub process_sys_traverse {
 		open($fh, '<', $_) or $b_fh = 0;
 		# needed for removing -T test and root
 		if ($b_fh){
-			while ($row = <$fh>) {
+			while ($row = <$fh>){
 				chomp($row);
 				$data .= $sep . '"' . $row . '"';
 				$sep=', ';
@@ -2200,24 +2336,44 @@ sub process_sys_traverse {
 	close $fh;
 	# print $fh "$result";
 }
-
+# perl compiler complains on start if prune = 1 used only once, so either 
+# do $File::Find::prune = 1 if !$File::Find::prune; OR use no warnings 'once'
 sub wanted {
+	# note: we want these directories pruned before the -d test so find 
+	# doesn't try to read files inside of the directories
+	if ($parse_src eq 'proc'){
+		if ($File::Find::name =~ m!^/proc/[0-9]+! || 
+		 $File::Find::name =~ m!^/proc/(irq|spl|sys)! ||
+		 # these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
+		 $File::Find::name =~ m!^/proc/k! ||
+		 $File::Find::name =~ m!^/proc/bus/pci! ||
+		 $File::Find::name =~ m!^/proc/(irq|spl|sys)!){
+			$File::Find::prune = 1;
+			return;
+		}
+	}
+	elsif ($parse_src eq 'sys'){
+		# note: a new file in 4.11 /sys can hang this, it is /parameter/ then
+		# a few variables. Since inxi does not need to see that file, we will
+		# not use it. 
+		if ($File::Find::name =~ m!/(kernel/|trace/|parameters|debug)!){
+			$File::Find::prune = 1;
+		}
+	}
 	return if -d; # not directory
 	return unless -e; # Must exist
 	return unless -f; # Must be file
 	return unless -r; # Must be readable
 	if ($parse_src eq 'sys'){
-		# note: a new file in 4.11 /sys can hang this, it is /parameter/ then
-		# a few variables. Since inxi does not need to see that file, we will
-		# not use it. Also do not need . files or __ starting files
 		# print $File::Find::name . "\n";
 		# block maybe: cfgroup\/
 		# picdec\/|, wait_for_fb_sleep/wake is an odroid thing caused hang
 		# wakeup_count also fails for android, but works fine on regular systems
-		return if $b_arm && $File::Find::name =~ /^\/sys\/power\/(wait_for_fb_|wakeup_count$)/;
-		return if $File::Find::name =~ /\/(\.[a-z]|kernel\/|trace\/|parameters\/|debug\/)/;
+		return if $b_arm && $File::Find::name =~ m!^/sys/power/(wait_for_fb_|wakeup_count$)!;
+		# do not need . files or __ starting files
+		return if $File::Find::name =~ m!/\.[a-z]!;
 		# pp_num_states: amdgpu driver bug; android: wakeup_count
-		return if $File::Find::name =~ /\/pp_num_states$/;
+		return if $File::Find::name =~ m!/pp_num_states$!;
 		# comment this one out if you experience hangs or if 
 		# we discover syntax of foreign language characters
 		# Must be ascii like. This is questionable and might require further
@@ -2226,13 +2382,8 @@ sub wanted {
 		# the readable tests in copy_files()
 		# return unless -T; 
 	}
-	elsif ($parse_src eq 'proc') {
-		return if $File::Find::name =~ /^\/proc\/[0-9]+\//;
-		return if $File::Find::name =~ /^\/proc\/bus\/pci\//;
-		return if $File::Find::name =~ /^\/proc\/(irq|spl|sys)\//;
-		# these choke on sudo/root: kmsg kcore kpage and we don't want keys or kallsyms
-		return if $File::Find::name =~ /^\/proc\/k/; 
-		return if $File::Find::name =~ /(\/mb_groups|debug)$/;
+	elsif ($parse_src eq 'proc'){
+		return if $File::Find::name =~ m!(/mb_groups|debug)$!;
 	}
 	# print $File::Find::name . "\n";
 	push(@content, $File::Find::name);
@@ -2242,8 +2393,6 @@ sub wanted {
 # args: 2 - optional: alternate ftp upload url
 # NOTE: must be in format: ftp.site.com/incoming
 sub upload_file {
-	require Net::FTP;
-	Net::FTP->import;
 	my ($self, $ftp_url) = @_;
 	my ($ftp, $domain, $host, $user, $pass, $dir, $error);
 	$ftp_url ||= main::get_defaults('ftp-upload');
@@ -2262,7 +2411,7 @@ sub upload_file {
 	# print "$host $domain $dir $user $pass\n";
 	print "File to be uploaded:\n$file_path\n";
 	
-	if ($host && ( $file_path && -e $file_path ) ){
+	if ($host && ($file_path && -e $file_path)){
 		# NOTE: important: must explicitly set to passive true/1
 		$ftp = Net::FTP->new($host, Debug => 0, Passive => 1) || main::error_handler('ftp-connect', $ftp->message);
 		$ftp->login($user, $pass) || main::error_handler('ftp-login', $ftp->message);
@@ -2285,6 +2434,7 @@ sub upload_file {
 	}
 }
 }
+
 # random tests for various issues
 sub user_debug_test_1 {
 # 	open(my $duped, '>&', STDOUT);
@@ -2300,6 +2450,12 @@ sub user_debug_test_1 {
 # 	close $duped;
 }
 
+# see docs/optimization.txt
+sub ram_use {
+    my ($name, $ref) = @_;
+    printf "%-25s %5d %5d\n", $name, size($ref), total_size($ref);
+}
+
 #### -------------------------------------------------------------------
 #### DOWNLOADER
 #### -------------------------------------------------------------------
@@ -2313,7 +2469,7 @@ sub download_file {
 	$dl{'no-ssl-opt'} ||= '';
 	$dl{'spider'} ||= '';
 	$file ||= 'N/A'; # to avoid debug error
-	if ( ! $dl{'dl'} ){
+	if (!$dl{'dl'}){
 		return 0;
 	}
 	if ($dl{'timeout'}){
@@ -2323,7 +2479,7 @@ sub download_file {
 	# print "$dl{'dl'}\n";
 	# tiny supports spider sort of
 	## NOTE: 1 is success, 0 false for Perl
-	if ($dl{'dl'} eq 'tiny' ){
+	if ($dl{'dl'} eq 'tiny'){
 		$cmd = "Using tiny: type: $type \nurl: $url \nfile: $file";
 		$result = get_file($type, $url, $file);
 		$debug_data = ($type ne 'stdout') ? $result : 'Success: stdout data not null.';
@@ -2338,21 +2494,21 @@ sub download_file {
 			$result = qx($cmd);
 			$debug_data = ($result) ? 'Success: stdout data not null.' : 'Download resulted in null data!';
 		}
-		elsif ($type eq 'file') {
+		elsif ($type eq 'file'){
 			$args = $dl{'file'};
 			$cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $args $file \"$url\" $dl{'null'}";
 			system($cmd);
 			$result = ($?) ? 0 : 1; # reverse these into Perl t/f
 			$debug_data = $result;
 		}
-		elsif ( $dl{'dl'} eq 'wget' && $type eq 'spider'){
+		elsif ($dl{'dl'} eq 'wget' && $type eq 'spider'){
 			$cmd = "$dl{'dl'} $dl{'no-ssl-opt'} $ua $timeout $dl{'spider'} \"$url\"";
 			system($cmd);
 			$result = ($?) ? 0 : 1; # reverse these into Perl t/f
 			$debug_data = $result;
 		}
 	}
-	print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $test[1];
+	print "-------\nDownloader Data:\n$cmd\nResult: $debug_data\n" if $dbg[1];
 	log_data('data',"$cmd\nResult: $result") if $b_log;
 	return $result;
 }
@@ -2369,26 +2525,26 @@ sub get_file {
 	$file ||= 'N/A';
 	log_data('dump','%{$response}',$response) if $b_log;
 	# print Dumper $response;
-	if ( ! $response->{'success'} ){
+	if (!$response->{'success'}){
 		my $content = $response->{'content'};
 		$content ||= "N/A\n";
 		my $msg = "Failed to connect to server/file!\n";
 		$msg .= "Response: ${content}Downloader: HTTP::Tiny URL: $url\nFile: $file";
 		log_data('data',$msg) if $b_log;
-		print error_defaults('download-error',$msg) if $test[1];
+		print error_defaults('download-error',$msg) if $dbg[1];
 		$return = 0;
 	}
 	else {
-		if ( $debug ){
+		if ($debug){
 			print "$response->{success}\n";
 			print "$response->{status} $response->{reason}\n";
-			while (my ($key, $value) = each %{$response->{'headers'}}) {
-				for (ref $value eq "ARRAY" ? @$value : $value) {
+			while (my ($key, $value) = each %{$response->{'headers'}}){
+				for (ref $value eq "ARRAY" ? @$value : $value){
 					print "$key: $_\n";
 				}
 			}
 		}
-		if ( $type eq "stdout" || $type eq "ua-stdout" ){
+		if ($type eq "stdout" || $type eq "ua-stdout"){
 			$return = $response->{'content'};
 		}
 		elsif ($type eq "spider"){
@@ -2422,15 +2578,15 @@ sub set_downloader {
 			$dl{'tiny'} = 0;
 		}
 	}
-	#print $dl{'tiny'} . "\n";
+	# print $dl{'tiny'} . "\n";
 	if ($dl{'tiny'}){
 		$dl{'dl'} = 'tiny';
 		$dl{'file'} = '';
 		$dl{'stdout'} = '';
 		$dl{'timeout'} = '';
 	}
-	elsif ( $dl{'curl'} && check_program('curl')  ){
-		$quiet = '-s ' if !$test[1];
+	elsif ($dl{'curl'} && check_program('curl')){
+		$quiet = '-s ' if !$dbg[1];
 		$dl{'dl'} = 'curl';
 		$dl{'file'} = "  -L ${quiet}-o ";
 		$dl{'no-ssl'} = ' --insecure';
@@ -2438,8 +2594,8 @@ sub set_downloader {
 		$dl{'timeout'} = ' -y ';
 		$dl{'ua'} = ' -A ' . $dl_ua;
 	}
-	elsif ($dl{'wget'} && check_program('wget') ){
-		$quiet = '-q ' if !$test[1];
+	elsif ($dl{'wget'} && check_program('wget')){
+		$quiet = '-q ' if !$dbg[1];
 		$dl{'dl'} = 'wget';
 		$dl{'file'} = " ${quiet}-O ";
 		$dl{'no-ssl'} = ' --no-check-certificate';
@@ -2449,14 +2605,15 @@ sub set_downloader {
 		$dl{'ua'} = ' -U ' . $dl_ua;
 	}
 	elsif ($dl{'fetch'} && check_program('fetch')){
-		$quiet = '-q ' if !$test[1];
+		$quiet = '-q ' if !$dbg[1];
 		$dl{'dl'} = 'fetch';
 		$dl{'file'} = " ${quiet}-o ";
 		$dl{'no-ssl'} = ' --no-verify-peer';
 		$dl{'stdout'} = " ${quiet}-o -";
 		$dl{'timeout'} = ' -T ';
 	}
-	elsif ( $bsd_type eq 'openbsd' && check_program('ftp') ){
+	# at least openbsd/netbsd
+	elsif ($bsd_type && check_program('ftp')){
 		$dl{'dl'} = 'ftp';
 		$dl{'file'} = ' -o ';
 		$dl{'null'} = ' 2>/dev/null';
@@ -2483,73 +2640,73 @@ sub set_perl_downloader {
 
 sub error_handler {
 	eval $start if $b_log;
-	my ( $err, $one, $two) = @_;
+	my ($err,$one,$two) = @_;
 	my ($b_help,$b_recommends);
 	my ($b_exit,$errno) = (1,0);
 	my $message = do {
-		if ( $err eq 'empty' ) { 'empty value' }
+		if ($err eq 'empty'){ 'empty value' }
 		## Basic rules
-		elsif ( $err eq 'not-in-irc' ) { 
+		elsif ($err eq 'not-in-irc'){ 
 			$errno=1; "You can't run option $one in an IRC client!" }
 		## Internal/external options
-		elsif ( $err eq 'bad-arg' ) { 
+		elsif ($err eq 'bad-arg'){ 
 			$errno=10; $b_help=1; "Unsupported value: $two for option: $one" }
-		elsif ( $err eq 'bad-arg-int' ) { 
+		elsif ($err eq 'bad-arg-int'){ 
 			$errno=11; "Bad internal argument: $one" }
-		elsif ( $err eq 'distro-block' ) { 
+		elsif ($err eq 'distro-block'){ 
 			$errno=20; "Option: $one has been disabled by the $self_name distribution maintainer." }
-		elsif ( $err eq 'option-feature-incomplete' ) { 
+		elsif ($err eq 'option-feature-incomplete'){ 
 			$errno=21; "Option: '$one' feature: '$two' has not been implemented yet." }
-		elsif ( $err eq 'unknown-option' ) { 
+		elsif ($err eq 'unknown-option'){ 
 			$errno=22; $b_help=1; "Unsupported option: $one" }
 		## Data
-		elsif ( $err eq 'open-data' ) { 
+		elsif ($err eq 'open-data'){ 
 			$errno=32; "Error opening data for reading: $one \nError: $two" }
-		elsif ( $err eq 'download-error' ) { 
+		elsif ($err eq 'download-error'){ 
 			$errno=33; "Error downloading file with $dl{'dl'}: $one \nError: $two" }
 		## Files:
-		elsif ( $err eq 'copy-failed' ) { 
+		elsif ($err eq 'copy-failed'){ 
 			$errno=40; "Error copying file: $one \nError: $two" }
-		elsif ( $err eq 'create' ) { 
+		elsif ($err eq 'create'){ 
 			$errno=41; "Error creating file: $one \nError: $two" }
-		elsif ( $err eq 'downloader-error' ) { 
+		elsif ($err eq 'downloader-error'){ 
 			$errno=42; "Error downloading file: $one \nfor download source: $two" }
-		elsif ( $err eq 'file-corrupt' ) { 
+		elsif ($err eq 'file-corrupt'){ 
 			$errno=43; "Downloaded file is corrupted: $one" }
-		elsif ( $err eq 'mkdir' ) { 
+		elsif ($err eq 'mkdir'){ 
 			$errno=44; "Error creating directory: $one \nError: $two" }
-		elsif ( $err eq 'open' ) { 
+		elsif ($err eq 'open'){ 
 			$errno=45; $b_exit=0; "Error opening file: $one \nError: $two" }
-		elsif ( $err eq 'open-dir' ) { 
+		elsif ($err eq 'open-dir'){ 
 			$errno=46; "Error opening directory: $one \nError: $two" }
-		elsif ( $err eq 'output-file-bad' ) { 
+		elsif ($err eq 'output-file-bad'){ 
 			$errno=47; "Value for --output-file must be full path, a writable directory, \nand include file name. Path: $two" }
-		elsif ( $err eq 'not-writable' ) { 
+		elsif ($err eq 'not-writable'){ 
 			$errno=48; "The file: $one is not writable!" }
-		elsif ( $err eq 'open-dir-failed' ) { 
+		elsif ($err eq 'open-dir-failed'){ 
 			$errno=49; "The directory: $one failed to open with error: $two" }
-		elsif ( $err eq 'remove' ) { 
+		elsif ($err eq 'remove'){ 
 			$errno=50; "Failed to remove file: $one Error: $two" }
-		elsif ( $err eq 'rename' ) { 
+		elsif ($err eq 'rename'){ 
 			$errno=51; "There was an error moving files: $one\nError: $two" }
-		elsif ( $err eq 'write' ) { 
+		elsif ($err eq 'write'){ 
 			$errno=52; "Failed writing file: $one - Error: $two!" }
 		## Downloaders
-		elsif ( $err eq 'missing-downloader' ) { 
+		elsif ($err eq 'missing-downloader'){ 
 			$errno=60; "Downloader program $two could not be located on your system." }
-		elsif ( $err eq 'missing-perl-downloader' ) { 
+		elsif ($err eq 'missing-perl-downloader'){ 
 			$errno=61; $b_recommends=1; "Perl downloader missing required module." }
 		## FTP
-		elsif ( $err eq 'ftp-bad-path' ) { 
+		elsif ($err eq 'ftp-bad-path'){ 
 			$errno=70; "Unable to locate for FTP upload file:\n$one" }
-		elsif ( $err eq 'ftp-connect' ) { 
+		elsif ($err eq 'ftp-connect'){ 
 			$errno=71; "There was an error with connection to ftp server: $one" }
-		elsif ( $err eq 'ftp-login' ) { 
+		elsif ($err eq 'ftp-login'){ 
 			$errno=72; "There was an error with login to ftp server: $one" }
-		elsif ( $err eq 'ftp-upload' ) { 
+		elsif ($err eq 'ftp-upload'){ 
 			$errno=73; "There was an error with upload to ftp server: $one" }
 		## Modules
-		elsif ( $err eq 'required-module' ) { 
+		elsif ($err eq 'required-module'){ 
 			$errno=80; $b_recommends=1; "The required $one Perl module is not installed:\n$two" }
 		## DEFAULT
 		else {
@@ -2616,7 +2773,7 @@ sub run {
 	['0', '', '', " "],
 	);
 	push(@rows, @data);
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
 	main::print_basic(\@rows); 
 	exit 0; # shell true
 }
@@ -2663,14 +2820,15 @@ sub check_items {
 	}
 	elsif ($type eq 'recommended system programs'){
 		if ($bsd_type){
-			@data = qw(camcontrol dig dmidecode fdisk file glabel gpart ifconfig ipmi-sensors 
-			ipmitool lsusb sudo smartctl sysctl tree upower uptime usbdevs);
+			@data = qw(camcontrol dig disklabel dmidecode doas fdisk file glabel gpart 
+			ifconfig ipmi-sensors ipmitool pciconfig pcidump pcictl smartctl sudo 
+			sysctl tree upower uptime usbconfig usbdevs);
 			$info_os = 'info-bsd';
 		}
 		else {
-			@data = qw(blockdev dig dmidecode fdisk file hciconfig hddtemp ifconfig ip ipmitool 
-			ipmi-sensors lsblk lsusb lvs mdadm modinfo runlevel sensors smartctl strings
-			sudo tree upower uptime);
+			@data = qw(blockdev bt-adapter dig dmidecode doas fdisk file hciconfig 
+			hddtemp ifconfig ip ipmitool ipmi-sensors lsblk lsusb lvs mdadm modinfo 
+			runlevel sensors smartctl strings sudo tree upower uptime);
 		}
 		$b_program = 1;
 		$item = 'Program';
@@ -2709,6 +2867,7 @@ sub check_items {
 	elsif ($type eq 'recommended Perl modules'){
 		@data = qw(File::Copy File::Find File::Spec::Functions HTTP::Tiny IO::Socket::SSL 
 		Time::HiRes Cpanel::JSON::XS JSON::XS XML::Dumper Net::FTP);
+		push(@data, qw(OpenBSD::Pledge OpenBSD::Unveil)) if $bsd_type && $bsd_type eq 'openbsd';
 		$b_perl_module = 1;
 		$item = 'Perl Module';
 		$extra = ' (Optional)';
@@ -2748,7 +2907,7 @@ sub check_items {
 		else {
 			@data = qw(/etc/lsb-release /etc/os-release /proc/asound/cards 
 			/proc/asound/version /proc/cpuinfo /proc/mdstat /proc/meminfo /proc/modules 
-			/proc/mounts /proc/scsi/scsi /var/log/Xorg.0.log );
+			/proc/mounts /proc/scsi/scsi /var/log/Xorg.0.log);
 		}
 		$b_file = 1;
 		$item = 'File';
@@ -2761,20 +2920,20 @@ sub check_items {
 	['0', '', '', " " ],
 	);
 	if ($extra2){
-		$rows[scalar @rows] = (['0', '', '', $extra2]);
-		$rows[scalar @rows] = (['0', '', '', ' ']);
+		$rows[scalar @rows] = ['0', '', '', $extra2];
+		$rows[scalar @rows] = ['0', '', '', ' '];
 	}
 	if ($extra3){
-		$rows[scalar @rows] = (['0', '', '', $extra3]);
-		$rows[scalar @rows] = (['0', '', '', ' ']);
+		$rows[scalar @rows] = ['0', '', '', $extra3];
+		$rows[scalar @rows] = ['0', '', '', ' '];
 	}
 	foreach my $item (@data){
 		$install = '';
 		$about = '';
 		%info = item_data($item);
 		$about = $info{$info_os};
-		if ( ( $b_dir && -d $item ) || ( $b_file && -r $item ) ||
-		     ($b_program && main::check_program($item) ) || 
+		if (($b_dir && -d $item) || ($b_file && -r $item) ||
+		     ($b_program && main::check_program($item)) || 
 		     ($b_perl_module && main::check_perl_module($item)) ||
 		     ($b_kernel_module && @modules && (grep {/^$item$/} @modules))){
 			$result = 'Present';
@@ -2792,23 +2951,23 @@ sub check_items {
 			push(@missing, "$item$install");
 		}
 		$row = make_row($item,$about,$result);
-		$rows[scalar @rows] = (['0', '', '', $row]);
+		$rows[scalar @rows] = ['0', '', '', $row];
 	}
-	$rows[scalar @rows] = (['0', '', '', " "]);
+	$rows[scalar @rows] = ['0', '', '', " "];
 	if (@missing){
-		$rows[scalar @rows] = (['0', '', '', "The following $type are missing$extra4:"]);
-		foreach (@missing) {
-			$rows[scalar @rows] = (['0', '', '', "$item: $_"]);
+		$rows[scalar @rows] = ['0', '', '', "The following $type are missing$extra4:"];
+		foreach (@missing){
+			$rows[scalar @rows] = ['0', '', '', "$item: $_"];
 		}
 	}
 	if (@unreadable){
-		$rows[scalar @rows] = (['0', '', '', "The following $type are not readable: "]);
-		foreach (@unreadable) {
-			$rows[scalar @rows] = (['0', '', '', "$item: $_"]);
+		$rows[scalar @rows] = ['0', '', '', "The following $type are not readable: "];
+		foreach (@unreadable){
+			$rows[scalar @rows] = ['0', '', '', "$item: $_"];
 		}
 	}
 	if (!@missing && !@unreadable){
-		$rows[scalar @rows] = (['0', '', '', "All $type are present"]);
+		$rows[scalar @rows] = ['0', '', '', "All $type are present"];
 	}
 	return @rows;
 }
@@ -2901,6 +3060,13 @@ sub item_data {
 	'pacman' => 'util-linux',
 	'rpm' => 'util-linux',
 	},
+	'bt-adapter' => {
+	'info' => '-E bluetooth data (if no hciconfig)',
+	'info-bsd' => '',
+	'apt' => 'bluez-tools',
+	'pacman' => 'bluez-tools',
+	'rpm' => 'bluez-tools',
+	},
 	'curl' => {
 	'info' => '-i (if no dig); -w,-W; -U',
 	'info-bsd' => '-i (if no dig); -w,-W; -U',
@@ -2922,6 +3088,13 @@ sub item_data {
 	'pacman' => 'dnsutils',
 	'rpm' => 'bind-utils',
 	},
+	'disklabel' => {
+	'info' => '',
+	'info-bsd' => '-j, -p, -P; -R; -o (Open/NetBSD+derived)',
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
 	'dmidecode' => {
 	'info' => '-M if no sys machine data; -m',
 	'info-bsd' => '-M if null sysctl; -m; -B if null sysctl',
@@ -2929,6 +3102,13 @@ sub item_data {
 	'pacman' => 'dmidecode',
 	'rpm' => 'dmidecode',
 	},
+	'doas' => {
+	'info' => '-Dx hddtemp-user; -o file-user (alt for sudo)',
+	'info-bsd' => '-Dx hddtemp-user; -o file-user',
+	'apt' => 'doas',
+	'pacman' => 'doas',
+	'rpm' => 'doas',
+	},
 	'fdisk' => {
 	'info' => '-D partition scheme (fallback)',
 	'info-bsd' => '-D partition scheme',
@@ -2966,16 +3146,16 @@ sub item_data {
 	},
 	'gpart' => {
 	'info' => '',
-	'info-bsd' => '-p,-P file system, size',
+	'info-bsd' => '-p,-P; -R; -o (FreeBSD+derived)',
 	'apt' => '',
 	'pacman' => '',
 	'rpm' => '',
 	},
 	'hciconfig' => {
-	'info' => '-E bluetooth HCI data',
+	'info' => '-E bluetooth data (deprecated, good report)',
 	'info-bsd' => '',
 	'apt' => 'bluez',
-	'pacman' => 'bluez-utils',
+	'pacman' => 'bluez-utils-compat (frugalware: bluez-utils)',
 	'rpm' => 'bluez-utils',
 	},
 	'hddtemp' => {
@@ -3029,7 +3209,7 @@ sub item_data {
 	},
 	'lsusb' => {
 	'info' => '-A usb audio; -J (optional); -N usb networking',
-	'info-bsd' => '-A; -J; -N. Alternate to usbdevs',
+	'info-bsd' => '',
 	'apt' => 'usbutils',
 	'pacman' => 'usbutils',
 	'rpm' => 'usbutils',
@@ -3048,6 +3228,27 @@ sub item_data {
 	'pacman' => 'module-init-tools',
 	'rpm' => 'module-init-tools',
 	},
+	'pciconfig' => {
+	'info' => '',
+	'info-bsd' => '-A,-E,-G,-N pci devices (FreeBSD+derived)',
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
+	'pcictl' => {
+	'info' => '',
+	'info-bsd' => '-A,-E,-G,-N pci devices (NetBSD+derived)',
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
+	'pcidump' => {
+	'info' => '',
+	'info-bsd' => '-A,-E,-G,-N pci devices (OpenBSD+derived, doas/su)',
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
 	'runlevel' => {
 	'info' => '-I fallback to Perl',
 	'info-bsd' => '',
@@ -3076,6 +3277,13 @@ sub item_data {
 	'pacman' => '?',
 	'rpm' => '?',
 	},
+	'sudo' => {
+	'info' => '-Dx hddtemp-user; -o file-user',
+	'info-bsd' => '-Dx hddtemp-user; -o file-user (alt for doas)',
+	'apt' => 'sudo',
+	'pacman' => 'sudo',
+	'rpm' => 'sudo',
+	},
 	'sysctl' => {
 	'info' => '',
 	'info-bsd' => '-C; -I; -m; -tm',
@@ -3083,13 +3291,6 @@ sub item_data {
 	'pacman' => '?',
 	'rpm' => '?',
 	},
-	'sudo' => {
-	'info' => '-Dx hddtemp-user; -o file-user',
-	'info-bsd' => '-Dx hddtemp-user; -o file-user',
-	'apt' => 'sudo',
-	'pacman' => 'sudo',
-	'rpm' => 'sudo',
-	},
 	'tree' => {
 	'info' => '--debugger 20,21 /sys tree',
 	'info-bsd' => '--debugger 20,21 /sys tree',
@@ -3111,9 +3312,16 @@ sub item_data {
 	'pacman' => 'procps',
 	'rpm' => 'procps',
 	},
+	'usbconfig' => {
+	'info' => '',
+	'info-bsd' => '-A; -E; -G; -J; -N; (FreeBSD+derived, doas/su)',
+	'apt' => 'usbutils',
+	'pacman' => 'usbutils',
+	'rpm' => 'usbutils',
+	},
 	'usbdevs' => {
 	'info' => '',
-	'info-bsd' => '-A; -J; -N;',
+	'info-bsd' => '-A; -E; -G; -J; -N; (Open/NetBSD+derived)',
 	'apt' => 'usbutils',
 	'pacman' => 'usbutils',
 	'rpm' => 'usbutils',
@@ -3131,7 +3339,7 @@ sub item_data {
 	'info-bsd' => '-G glx info',
 	'apt' => 'mesa-utils',
 	'pacman' => 'mesa-demos',
-	'rpm' => 'glx-utils (openSUSE 12.3 and later Mesa-demo-x)',
+	'rpm' => 'glx-utils (SUSE: Mesa-demo-x)',
 	},
 	'wmctrl' => {
 	'info' => '-S active window manager (fallback)',
@@ -3145,7 +3353,7 @@ sub item_data {
 	'info-bsd' => '-G multi screen resolution',
 	'apt' => 'X11-utils',
 	'pacman' => 'xorg-xdpyinfo',
-	'rpm' => 'xorg-x11-utils',
+	'rpm' => 'xorg-x11-utils (SUSE/Fedora?: xdpyinfo)',
 	},
 	'xprop' => {
 	'info' => '-S desktop data',
@@ -3159,7 +3367,7 @@ sub item_data {
 	'info-bsd' => '-G single screen resolution',
 	'apt' => 'x11-xserver-utils',
 	'pacman' => 'xrandr',
-	'rpm' => 'x11-server-utils',
+	'rpm' => 'x11-server-utils (Fedora: xrandr)',
 	},
 	# Perl Modules
 	'Cpanel::JSON::XS' => {
@@ -3218,6 +3426,20 @@ sub item_data {
 	'pacman' => 'Core Modules',
 	'rpm' => 'Core Modules',
 	},
+	'OpenBSD::Pledge' => {
+	'info' => "$self_name Perl pledge support.",
+	'info-bsd' => "$self_name Perl pledge support.",
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
+	'OpenBSD::Unveil' => {
+	'info' => "Experimental: $self_name Perl unveil support.",
+	'info-bsd' => "Experimental: $self_name Perl unveil support.",
+	'apt' => '',
+	'pacman' => '',
+	'rpm' => '',
+	},
 	'Time::HiRes' => {
 	'info' => '-C cpu sleep (not required); --debug timers',
 	'info-bsd' => '-C cpu sleep (not required); --debug timers',
@@ -3263,7 +3485,7 @@ sub make_row {
 }
 sub make_line {
 	my $line = '';
-	foreach (0 .. $size{'max'} - 2 ){
+	foreach (0 .. $size{'max'} - 2){
 		$line .= '-';
 	}
 	return $line;
@@ -3286,8 +3508,9 @@ sub awk {
 	my ($ref,$search,$num,$sep) = @_;
 	my ($result);
 	# print "search: $search\n";
-	return if ! @$ref || ! $search;
+	return if !@$ref || !$search;
 	foreach (@$ref){
+		next if !defined $_;
 		if (/$search/i){
 			$result = $_;
 			$result =~ s/^\s+|\s+$//g;
@@ -3351,6 +3574,7 @@ sub compare_versions {
 sub convert_hex {
 	return (defined $_[0] && $_[0] =~ /^0x/) ? hex($_[0]) : $_[0];
 }
+
 # returns count of files in directory, if 0, dir is empty
 sub count_dir_files {
 	return unless -d $_[0];
@@ -3371,7 +3595,7 @@ sub get_piece {
 	$string =~ s/^\s+|\s+$//g;
 	my @temp = split(/$sep/, $string);
 	eval $end if $b_log;
-	if ( exists $temp[$num] ){
+	if (exists $temp[$num]){
 		$temp[$num] =~ s/,//g;
 		return $temp[$num];
 	}
@@ -3385,10 +3609,16 @@ sub grabber {
 	eval $start if $b_log;
 	my ($cmd,$split,$strip) = @_;
 	$split ||= "\n";
-	my @rows = split(/$split/, qx($cmd));
-	if ($strip && @rows){
-		@rows = grep {/^\s*[^#]/} @rows;
-		@rows = map {s/^\s+|\s+$//g; $_} @rows if @rows;
+	my @rows;
+	if ($strip){
+		for (split(/$split/, qx($cmd))){
+			next if /^\s*(#|$)/;
+			$_ =~ s/^\s+|\s+$//g;
+			push(@rows,$_);
+		}
+	}
+	else {
+		@rows = split(/$split/, qx($cmd));
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -3401,6 +3631,7 @@ sub globber {
 	eval $end if $b_log;
 	return @files;
 }
+
 # arg MUST be quoted when inserted, otherwise perl takes it for a hex number
 sub is_hex {
 	return (defined $_[0] && $_[0] =~ /^0x/) ? 1 : 0;
@@ -3414,7 +3645,7 @@ sub is_int {
 
 # receives string, returns boolean 1 if numeric. tr/// is 4x faster than regex
 sub is_numeric {
-	return 1 if ( defined $_[0] && ( $_[0] =~ tr/0123456789//) >= 1 && 
+	return 1 if (defined $_[0] && ($_[0] =~ tr/0123456789//) >= 1 && 
 	length($_[0]) == ($_[0] =~ tr/0123456789.//) && ($_[0] =~ tr/.//) <= 1);
 }
 
@@ -3455,14 +3686,14 @@ sub program_data {
 	eval $start if $b_log;
 	my ($values_id,$version_id,$level) = @_;
 	my (@data,$path,@program_data);
-	$level = 0 if ! $level;
-	#print "val_id: $values_id ver_id:$version_id lev:$level ex:$extra\n";
-	$version_id = $values_id if ! $version_id;
+	$level = 0 if !$level;
+	# print "val_id: $values_id ver_id:$version_id lev:$level ex:$extra\n";
+	$version_id = $values_id if !$version_id;
 	@data = program_values($values_id);
 	if ($data[3]){
 		$program_data[0] = $data[3];
 		# programs that have no version method return 0 0 for index 1 and 2
-		if ( $extra >= $level && $data[1] && $data[2]){
+		if ($extra >= $level && $data[1] && $data[2]){
 			$program_data[1] = program_version($version_id,$data[0],
 			$data[1],$data[2],$data[5],$data[6],$data[7],$data[8]);
 		}
@@ -3473,7 +3704,7 @@ sub program_data {
 	return @program_data;
 }
 
-# it's almost 1000 times slower to load these each time program_values is called!!
+# It's almost 1000 times slower to load these each time program_values is called!!
 sub set_program_values {
 	%program_values = (
 	## Clients ##
@@ -3498,7 +3729,9 @@ sub set_program_values {
 	'xchat-gnome' => ['[0-9.]+',2,'-v','X-Chat-Gnome',1,1,0,'',''],
 	'xchat' => ['[0-9.]+',2,'-v','X-Chat',1,1,0,'',''],
 	## Desktops / wm / compositors ##
+	'2bwm' => ['^2bwm',0,'0','2bWM',0,1,0,'',''], # unverified/based on mcwm
 	'3dwm' => ['^3dwm',0,'0','3Dwm',0,1,0,'',''], # unverified
+	'5dwm' => ['^5dwm',0,'0','5Dwm',0,1,0,'',''], # unverified
 	'9wm' => ['^9wm',3,'-version','9wm',0,1,0,'',''],
 	'aewm' => ['^aewm',3,'--version','aewm',0,1,0,'',''],
 	'aewm++' => ['^Version:',2,'-version','aewm++',0,1,0,'',''],
@@ -3514,10 +3747,12 @@ sub set_program_values {
 	'budgie-wm' => ['^budgie',0,'0','budgie-wm',0,1,0,'',''],
 	'cagebreak' => ['^Cagebreak',3,'-v','Cagebreak',0,1,0,'',''],
 	'calmwm' => ['^calmwm',0,'0','CalmWM',0,1,0,'',''], # unverified
+	'catwm' => ['^catwm',0,'0','catwm',0,1,0,'',''], # unverified
 	'cinnamon' => ['^cinnamon',2,'--version','Cinnamon',0,1,0,'',''],
 	'clfswm' => ['^clsfwm',0,'0','clfswm',0,1,0,'',''], # no version
 	'compiz' => ['^compiz',2,'--version','Compiz',0,1,0,'',''],
 	'compton' => ['^\d',1,'--version','Compton',0,1,0,'',''],
+	'ctwm' => ['^\S',1,'-version','ctwm',0,1,0,'',''],
 	'cwm' => ['^cwm',0,'0','CWM',0,1,0,'',''], # no version
 	'dcompmgr' => ['^dcompmgr',0,'0','dcompmgr',0,1,0,'',''], # unverified
 	'deepin' => ['^Version',2,'file','Deepin',0,100,'=','','/etc/deepin-version'], # special
@@ -3533,10 +3768,11 @@ sub set_program_values {
 	'fireplace' => ['^fireplace',0,'0','fireplace',0,1,0,'',''], # unverified
 	'fluxbox' => ['^fluxbox',2,'-v','Fluxbox',0,1,0,'',''],
 	'flwm' => ['^flwm',0,'0','FLWM',0,0,1,'',''], # no version
-	'fvwm' => ['^fvwm',2,'-version','FVWM',0,1,0,'',''],
+	# openbsd changed: version string: [FVWM[[main] Fvwm.. sigh, and outputs to stderr. Why?
+	'fvwm' => ['^fvwm',2,'-version','FVWM',0,1,0,'',''], 
 	'fvwm1' => ['^Fvwm',3,'-version','FVWM1',0,1,1,'',''],
-	'fvwm2' => ['^fvwm',2,'--version','fVWM2',0,1,0,'',''],
-	'fvwm3' => ['^fvwm',2,'--version','fVWM3',0,1,0,'',''],
+	'fvwm2' => ['^fvwm',2,'--version','FVWM2',0,1,0,'',''],
+	'fvwm3' => ['^fvwm',2,'--version','FVWM3',0,1,0,'',''],
 	'fvwm95' => ['^fvwm',2,'--version','FVWM95',0,1,1,'',''],
 	'fvwm-crystal' => ['^fvwm',2,'--version','FVWM-Crystal',0,0,0,'',''], # for print name fvwm
 	'gala' => ['^gala',0,'0','gala',0,1,0,'',''], # pantheon wm: super slow result, 2, '--version' works?
@@ -3554,18 +3790,19 @@ sub set_program_values {
 	'ion3' => ['^ion3',0,'--version','Ion3',0,1,0,'',''], # unverified; also shell called ion
 	'jbwm' => ['jbwm',3,'-v','JBWM',0,1,0,'',''], # might use full path in match
 	'jwm' => ['^jwm',2,'--version','JWM',0,1,0,'',''],
-	'kded' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
-	'kded1' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
-	'kded2' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
-	'kded3' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
-	'kded4' => ['^KDE Development Platform:',4,'--version','KDE',0,1,0,'',''],
+	'kded' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,1,0,'\sDevelopment Platform',''],
+	'kded1' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,1,0,'\sDevelopment Platform',''],
+	'kded2' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,1,0,'\sDevelopment Platform',''],
+	'kded3' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,1,0,'\sDevelopment Platform',''],
+	'kded4' => ['^KDE( Development Platform)?:',2,'--version','KDE',0,1,0,'\sDevelopment Platform',''],
 	'ksmcon' => ['^ksmcon',0,'0','ksmcon',0,1,0,'',''],# no version
 	'kwin' => ['^kwin',0,'0','kwin',0,1,0,'',''],# no version
 	'kwin_wayland' => ['^kwin_wayland',0,'0','kwin_wayland',0,1,0,'',''],# no version
 	'kwin_x11' => ['^kwin_x11',0,'0','kwin_x11',0,1,0,'',''],# no version
 	'larswm' => ['^larswm',2,'-v','larswm',0,1,1,'',''],
+	'leftwm' => ['^leftwm',0,'0','LeftWM',0,1,0,'',''],# no version, in CHANGELOG
 	'liri' => ['^liri',0,'0','liri',0,1,0,'',''],
-	'lumina' => ['^\S',1,'--version','Lumina',0,1,1,'',''],
+	'lumina-desktop' => ['^\S',1,'--version','Lumina',0,1,1,'',''],
 	'lwm' => ['^lwm',0,'0','lwm',0,1,0,'',''], # no version
 	'lxpanel' => ['^lxpanel',2,'--version','LXDE',0,1,0,'',''],
 	# command: lxqt-panel
@@ -3579,11 +3816,13 @@ sub set_program_values {
 	'mate-about' => ['^MATE[[:space:]]DESKTOP',-1,'--version','MATE',0,1,0,'',''],
 	# note, mate-session when launched with full path returns full path in version string
 	'mate-session' => ['mate-session',-1,'--version','MATE',0,1,0,'',''], 
+	'mcwm' => ['^mcwm',0,'0','mcwm',0,1,0,'',''], # unverified/see 2bwm
 	'metacity' => ['^metacity',2,'--version','Metacity',0,1,0,'',''],
 	'metisse' => ['^metisse',0,'0','metisse',0,1,0,'',''],
 	'mini' => ['^Mini',5,'--version','Mini',0,1,0,'',''],
 	'mir' => ['^mir',0,'0','mir',0,1,0,'',''],# unverified
 	'moblin' => ['^moblin',0,'0','moblin',0,1,0,'',''],# unverified
+	'monsterwm' => ['^monsterwm',0,'0','monsterwm',0,1,0,'',''],# unverified
 	'motorcar' => ['^motorcar',0,'0','motorcar',0,1,0,'',''],# unverified
 	'muffin' => ['^muffin',2,'--version','Muffin',0,1,0,'',''],
 	'musca' => ['^musca',0,'-v','Musca',0,1,0,'',''], # unverified
@@ -3596,6 +3835,7 @@ sub set_program_values {
 	'pantheon' => ['^pantheon',0,'0','Pantheon',0,1,0,'',''],# no version
 	'papyros' => ['^papyros',0,'0','papyros',0,1,0,'',''],# no version
 	'pekwm' => ['^pekwm',3,'--version','PekWM',0,1,0,'',''],
+	'penrose' => ['^penrose',0,'0','Penrose',0,1,0,'',''],# no version?
 	'perceptia' => ['^perceptia',0,'0','perceptia',0,1,0,'',''],
 	'picom' => ['^\S',1,'--version','Picom',0,1,0,'^v',''],
 	'plasmashell' => ['^plasmashell',2,'--version','KDE Plasma',0,1,0,'',''],
@@ -3607,6 +3847,7 @@ sub set_program_values {
 	'sawfish' => ['^sawfish',3,'--version','Sawfish',0,1,0,'',''],
 	'scrotwm' => ['^scrotwm.*welcome.*',5,'-v','scrotwm',0,1,1,'',''],
 	'sommelier' => ['^sommelier',0,'0','sommelier',0,1,0,'',''], # unverified
+	'snapwm' => ['^snapwm',0,'0','snapwm',0,1,0,'',''], # unverified
 	'spectrwm' => ['^spectrwm.*welcome.*wm',5,'-v','spectrwm',0,1,1,'',''],
 	# out of stump, 2 --version, but in tries to start new wm instance endless hang
 	'stumpwm' => ['^SBCL',0,'--version','StumpWM',0,1,0,'',''], # hangs when run in wm
@@ -3621,7 +3862,8 @@ sub set_program_values {
 	'unagi' => ['^\S',1,'--version','unagi',0,1,0,'',''],
 	'unity' => ['^unity',2,'--version','Unity',0,1,0,'',''],
 	'unity-system-compositor' => ['^unity-system-compositor',2,'--version',
-	 'unity-system-compositor (mir)',0,0,0,'',''],
+	'unity-system-compositor (mir)',0,0,0,'',''],
+	'uwm' => ['^uwm',0,'0','UWM',0,1,0,'',''], # unverified
 	'wavy' => ['^wavy',0,'0','wavy',0,1,0,'',''], # unverified
 	'waycooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
 	'way-cooler' => ['^way',3,'--version','way-cooler',0,1,0,'',''],
@@ -3630,8 +3872,11 @@ sub set_program_values {
 	'westford' => ['^westford',0,'0','westford',0,1,0,'',''], # unverified
 	'weston' => ['^weston',0,'0','weston',0,1,0,'',''], # unverified
 	'windowlab' => ['^windowlab',2,'-about','WindowLab',0,1,0,'',''],
+	'wingo' => ['^wingo',0,'0','Wingo',0,1,0,'',''], # unverified
 	'wm2' => ['^wm2',0,'0','wm2',0,1,0,'',''], # no version
 	'wmaker' => ['^Window[[:space:]]*Maker',-1,'--version','WindowMaker',0,1,0,'',''],
+	'wmfs' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
+	'wmfs2' => ['^wmfs',0,'0','WMFS',0,1,0,'',''], # unverified
 	'wmii' => ['^wmii',1,'-v','wmii',0,1,0,'^wmii[234]?-',''], # wmii is wmii3
 	'wmii2' => ['^wmii2',1,'--version','wmii2',0,1,0,'^wmii[234]?-',''],
 	'wmx' => ['^wmx',0,'0','wmx',0,1,0,'',''], # no version
@@ -3641,6 +3886,10 @@ sub set_program_values {
 	'xfdesktop' => ['xfdesktop[[:space:]]version',5,'--version','Xfce',0,1,0,'',''],
 	# command: xfdesktop
 	'xfdesktop-toolkit' => ['Built[[:space:]]with[[:space:]]GTK',4,'--version','Gtk',0,1,0,'',''],
+	# '        This is xfwm4 version 4.16.1 (revision 5f61a84ad) for Xfce 4.16'
+	'xfwm' => ['xfwm[3-8]? version',5,'--version','xfwm',0,1,0,'^^\s+',''],# unverified
+	'xfwm4' => ['xfwm4? version',5,'--version','xfwm',0,1,0,'^^\s+',''],
+	'xfwm5' => ['xfwm5? version',5,'--version','xfwm',0,1,0,'^^\s+',''], # unverified
 	'xmonad' => ['^xmonad',2,'--version','XMonad',0,1,0,'',''],
 	'yeahwm' => ['^yeahwm',0,'--version','YeahWM',0,1,0,'',''], # unverified
 	## Toolkits ##
@@ -3653,6 +3902,7 @@ sub set_program_values {
 	'gdm' => ['^gdm',2,'--version','GDM',0,1,0,'',''],
 	'gdm3' => ['^gdm',2,'--version','GDM3',0,1,0,'',''],
 	'kdm' => ['^kdm',0,'0','KDM',0,1,0,'',''],
+	'kdm3' => ['^kdm',0,'0','KDM',0,1,0,'',''],
 	'ldm' => ['^ldm',0,'0','LDM',0,1,0,'',''],
 	'lightdm' => ['^lightdm',2,'--version','LightDM',0,1,1,'',''],
 	'lxdm' => ['^lxdm',0,'0','LXDM',0,1,0,'',''],
@@ -3668,7 +3918,7 @@ sub set_program_values {
 	'xdm' => ['^xdm',0,'0','XDM',0,1,0,'',''],
 	'xenodm' => ['^xenodm',0,'0','xenodm',0,1,0,'',''],
 	## Shells - not checked: ion, eshell ##
-	## See test_shell() for unhandled but known shells
+	## See ShellData::shell_test() for unhandled but known shells
 	'ash' => ['',3,'pkg','ash',1,0,0,'',''], # special; dash precursor
 	'bash' => ['^GNU[[:space:]]bash',4,'--version','Bash',1,1,0,'',''],
 	'busybox' => ['^busybox',0,'0','BusyBox',1,0,0,'',''], # unverified, hush/ash likely
@@ -3714,10 +3964,10 @@ sub program_values {
 	my ($app) = @_;
 	my (@program_data);
 	set_program_values() if !%program_values;
-	if ( defined $program_values{$app} ){
+	if (defined $program_values{$app}){
 		@program_data = @{$program_values{$app}};
 	}
-	#my $debug = Dumper \@program_data;
+	# my $debug = Dumper \@program_data;
 	log_data('dump',"Program Data",\@program_data) if $b_log;
 	return @program_data;
 }
@@ -3741,8 +3991,8 @@ sub program_version {
 	$num-- if (defined $num && $num > 0);
 	# konvi in particular doesn't like using $ENV{'PATH'} as set, so we need
 	# to always assign the full path if it hasn't already been done
-	if ( $version ne 'file' && $app !~ /^\// ){
-		if (my $program = check_program($app) ){
+	if ($version ne 'file' && $app !~ /^\//){
+		if (my $program = check_program($app)){
 			$app = $program;
 		}
 		else {
@@ -3768,7 +4018,7 @@ sub program_version {
 		return 0 if !$cmd;
 	}
 	# note, some wm/apps send version info to stderr instead of stdout
-	elsif ($stderr) {
+	elsif ($stderr){
 		$cmd = "$app $version 2>&1";
 	}
 	else {
@@ -3788,7 +4038,7 @@ sub program_version {
 		while (<$ch>){
 			#chomp;
 			last if $count > $exit;
-			if ( $_ =~ /$search/i ) {
+			if ($_ =~ /$search/i){
 				$_ = trimmer($_);
 				# print "loop: $_ :: num: $num\n";
 				$_ =~ s/$replace//i if $replace;
@@ -3824,7 +4074,7 @@ sub program_version_cmd {
 	eval $start if $b_log;
 	my ($app,$app_name,$extra) = @_;
 	my @data = ('',0);
-	if ($app_name eq 'cicada') {
+	if ($app_name eq 'cicada'){
 		$data[0] = $app . ' -c "' . $extra . '" 2>/dev/null';}
 	elsif ($app_name =~ /^(|l|lo|m|pd)ksh(93)?$/){
 		$data[0] = $app . ' -c \'printf %s "$KSH_VERSION"\' 2>/dev/null';
@@ -3835,21 +4085,22 @@ sub program_version_cmd {
 	eval $end if $b_log;
 	return @data;
 }
+
 # returns $cmd, $search
 sub program_version_pkg  {
 	eval $start if $b_log;
 	my ($app) = @_;
 	my ($program,@data);
 	# note: version $num is 3 in dpkg-query/pacman/rpm, which is convenient
-	if ($program = check_program('dpkg-query') ){
+	if ($program = check_program('dpkg-query')){
 		$data[0] = "$program -W -f='\${Package}\tversion\t\${Version}\n' $app 2>/dev/null";
 		$data[1] = "^$app\\b";
 	}
-	elsif ($program = check_program('pacman') ){
+	elsif ($program = check_program('pacman')){
 		$data[0] = "$program -Q --info $app 2>/dev/null";
 		$data[1] = '^Version';
 	}
-	elsif ($program = check_program('rpm') ){
+	elsif ($program = check_program('rpm')){
 		$data[0] = "$program -qi --nodigest --nosignature $app 2>/dev/null";
 		$data[1] = '^Version';
 	}
@@ -3865,13 +4116,18 @@ sub program_version_pkg  {
 sub reader {
 	eval $start if $b_log;
 	my ($file,$strip,$index) = @_;
-	return if ! $file;
-	open(my $fh, '<', $file ) or error_handler('open', $file, $!);
+	return if !$file;
+	open(my $fh, '<', $file) or error_handler('open', $file, $!);
 	chomp(my @rows = <$fh>);
 	close $fh if $fh;
 	if (@rows && $strip){
-		@rows = grep {/^\s*[^#]/} @rows;
-		@rows = map {s/^\s+|\s+$//g; $_} @rows if @rows;
+		my @temp;
+		for (@rows){
+			next if /^\s*(#|$)/;
+			$_ =~ s/^\s+|\s+$//g;
+			push(@temp,$_);
+		}
+		@rows = @temp;
 	}
 	eval $end if $b_log;
 	# note: returns undef scalar value if $rows[index] does not exist
@@ -3881,8 +4137,8 @@ sub reader {
 # args: 1 - the file to create if not exists
 sub toucher {
 	my $file = shift;
-	if ( ! -e $file ){
-		open( my $fh, '>', $file ) or error_handler('create', $file, $!);
+	if (! -e $file){
+		open(my $fh, '>', $file) or error_handler('create', $file, $!);
 	}
 }
 
@@ -3890,10 +4146,10 @@ sub toucher {
 # arg: 1 - string to be right left trimmed. Also slices off \n so no chomp needed
 # this thing is super fast, no need to log its times etc, 0.0001 seconds or less
 sub trimmer {
-	#eval $start if $b_log;
+	# eval $start if $b_log;
 	my ($str) = @_;
 	$str =~ s/^\s+|\s+$|\n$//g; 
-	#eval $end if $b_log;
+	# eval $end if $b_log;
 	return $str;
 }
 
@@ -3924,7 +4180,7 @@ sub writer {
 
 #### -------------------------------------------------------------------
 #### UPDATER
-##### -------------------------------------------------------------------
+#### -------------------------------------------------------------------
 
 # arg 1: type to return
 sub get_defaults {
@@ -3936,12 +4192,12 @@ sub get_defaults {
 	'inxi-dev' => 'https://smxi.org/in/',
 	'inxi-main' => 'https://github.com/smxi/inxi/raw/master/',
 	'inxi-pinxi' => 'https://github.com/smxi/inxi/raw/inxi-perl/',
-	'inxi-man' => "https://smxi.org/in/$self_name.1.gz",
+	'inxi-man' => "https://smxi.org/in/$self_name.1",
 	'inxi-man-gh' => "https://github.com/smxi/inxi/raw/master/$self_name.1",
-	'pinxi-man' => "https://smxi.org/in/$self_name.1.gz",
+	'pinxi-man' => "https://smxi.org/in/$self_name.1",
 	'pinxi-man-gh' => "https://github.com/smxi/inxi/raw/inxi-perl/$self_name.1",
 	);
-	if ( exists $defaults{$type}){
+	if (exists $defaults{$type}){
 		return $defaults{$type};
 	}
 	else {
@@ -3954,7 +4210,7 @@ sub get_defaults {
 # note that 1 must end in / to properly construct the url path
 sub update_me {
 	eval $start if $b_log;
-	my ( $self_download, $download_id ) = @_;
+	my ($self_download,$download_id) = @_;
 	my $downloader_error=1;
 	my $file_contents='';
 	my $output = '';
@@ -3962,10 +4218,10 @@ sub update_me {
 	$self_download =~ s/\/$//; # dirname sometimes ends with /, sometimes not
 	my $full_self_path = "$self_path/$self_name";
 	
-	if ( $b_irc ){
-		error_handler('not-in-irc', "-U/--update" )
+	if ($b_irc){
+		error_handler('not-in-irc', "-U/--update")
 	}
-	if ( ! -w $full_self_path ){
+	if (! -w $full_self_path){
 		error_handler('not-writable', "$self_name", '');
 	}
 	$output .= "Starting $self_name self updater.\n";
@@ -3980,23 +4236,23 @@ sub update_me {
 	$file_contents = download_file('stdout', $self_download);
 	
 	# then do the actual download
-	if (  $file_contents ){
+	if ($file_contents){
 		# make sure the whole file got downloaded and is in the variable
-		if ( $file_contents =~ /###\*\*EOF\*\*###/ ){
+		print "Validating downloaded data...\n";
+		if ($file_contents =~ /###\*\*EOF\*\*###/){
 			open(my $fh, '>', $full_self_path);
-			print $fh $file_contents or error_handler('write', "$full_self_path", "$!" );
+			print $fh $file_contents or error_handler('write', $full_self_path, "$!");
 			close $fh;
-			qx( chmod +x '$self_path/$self_name' );
+			qx(chmod +x '$self_path/$self_name');
 			set_version_data();
 			$output .= "Successfully updated to $download_id version: $self_version\n";
 			$output .= "New $download_id version patch number: $self_patch\n";
 			$output .= "New $download_id version release date: $self_date\n";
 			$output .= "To run the new version, just start $self_name again.\n";
 			$output .= "$line3\n";
-			$output .= "Starting download of man page file now.\n";
 			print $output;
 			$output = '';
-			if ($b_man){
+			if ($use{'man'}){
 				update_man($download_id);
 			}
 			else {
@@ -4016,62 +4272,74 @@ sub update_me {
 }
 
 sub update_man {
+	eval $start if $b_log;
 	my ($download_id) = @_;
-	my $man_file_location=set_man_location();
-	my $man_file_path="$man_file_location/$self_name.1" ;
-	my ($man_file_url,$output) = ('','');
-	
-	my $b_downloaded = 0;
-	if ( ! -d $man_file_location ){
+	my $man_file_location = set_man_location();
+	my $man_file_path = "$man_file_location/$self_name.1" ;
+	my ($file_contents,$man_file_url,$output,$program) = ('','','','');
+	print "Starting download of man page file now.\n";
+	if (! -d $man_file_location){
 		print "The required man directory was not detected on your system.\n";
 		print "Unable to continue: $man_file_location\n";
 		return 0;
 	}
-	if ( ! -w $man_file_location ){
+	if (! -w $man_file_location){
 		print "Cannot write to $man_file_location! Root privileges required.\n";
 		print "Unable to continue: $man_file_location\n";
 		return 0;
 	}
-	if ( -f "/usr/share/man/man8/inxi.8.gz" ){
+	if (-f "/usr/share/man/man8/inxi.8.gz"){
 		print "Updating man page location to man1.\n";
 		rename "/usr/share/man/man8/inxi.8.gz", "$man_file_location/inxi.1.gz";
-		if ( check_program('mandb') ){
-			system( 'mandb' );
+		if (check_program('mandb')){
+			system('mandb');
 		}
 	}
-	 # first choice is inxi.1/pinxi.1 from gh, second gz from smxi.org
-	if ( $download_id ne 'dev server' && (my $program = check_program('gzip'))){
-		$man_file_url=get_defaults($self_name . '-man-gh'); 
-		print "Downloading Man page file...\n";
-		$b_downloaded = download_file('file', $man_file_url, $man_file_path);
-		if ($b_downloaded){
-			print "Download successful. Compressing file...\n";
+	if (!($program = check_program('gzip'))){
+		print "Required program gzip not found. Unable to install man page.\n";
+		return 0;
+	}
+	 # first choice is inxi.1/pinxi.1 from gh, second from smxi.org
+	if ($download_id ne 'dev server'){
+		$man_file_url = get_defaults($self_name . '-man-gh'); 
+	}
+	else {
+		$man_file_url = get_defaults($self_name . '-man'); 
+	}
+	print "Updating $self_name.1 in $man_file_location\n";
+	print "using $download_id branch as download source\n";
+	print "Downloading man page file...\n";
+	print "Download URL: $man_file_url\n" if $dbg[1];
+	$file_contents = download_file('stdout', $man_file_url);
+	if ($file_contents){
+		# make sure the whole file got downloaded and is in the variable
+		print "Download successful. Validating downloaded man file data...\n";
+		if ($file_contents =~ m|\.\\" EOF|){
+			print "Contents validated. Writing to man location...\n";
+			open(my $fh, '>', $man_file_path);
+			print $fh $file_contents or error_handler('write', $man_file_path, "$!");
+			close $fh;
+			print "Writing successful. Compressing file...\n";
 			system("$program -9 -f $man_file_path > $man_file_path.gz");
 			my $err = $?;
 			if ($err > 0){
-				print "Oh no! Something went wrong compressing the manfile:\n";
-				print "Local path: $man_file_path Error: $err\n";
+				print "Oh no! Something went wrong compressing the man file!\n";
+				print "Error: $err\n";
 			}
 			else {
-				print "Download and install of man page successful.\nCheck to make sure it works: man $self_name\n";
+				print "Download, install, and compression of man page successful.\n";
+				print "Check to make sure it works: man $self_name\n";
 			}
 		}
-	}
-	else {
-		$man_file_url = get_defaults($self_name . '-man'); 
-		# used to use spider tests, but only wget supports that, so no need
-		print "Downloading Man page file gz...\n";
-		$man_file_path .= '.gz';
-		# returns perl, 1 for true, 0 for false, even when using shell tool returns
-		$b_downloaded = download_file('file', $man_file_url,  $man_file_path );
-		if ($b_downloaded) {
-			print "Download and install of man page successful.\nCheck to make sure it works: man $self_name\n";
+		else {
+			error_handler('file-corrupt', "$self_name.1");
 		}
 	}
-	if ( !$b_downloaded ){
-		print "Oh no! Something went wrong downloading the Man file at:\n$man_file_url\n";
-		print "Try -U with --dbg 1 for more information on the failure.\n";
+	# now run the error handlers on any downloader failure
+	else {
+		error_handler('download-error', $man_file_url, $download_id);
 	}
+	eval $end if $b_log;
 }
 
 sub set_man_location {
@@ -4080,22 +4348,22 @@ sub set_man_location {
 	my $man_paths=qx(man --path 2>/dev/null);
 	my $man_local='/usr/local/share/man';
 	my $b_use_local=0;
-	if ( $man_paths && $man_paths =~ /$man_local/ ){
+	if ($man_paths && $man_paths =~ /$man_local/){
 		$b_use_local=1;
 	}
 	# for distro installs
-	if ( -f "$default_location/inxi.1.gz" ){
+	if (-f "$default_location/inxi.1.gz"){
 		$location=$default_location;
 	}
 	else {
-		if ( $b_use_local ){
-			if ( ! -d "$man_local/man1" ){
+		if ($b_use_local){
+			if (! -d "$man_local/man1"){
 				mkdir "$man_local/man1";
 			}
 			$location="$man_local/man1";
 		}
 	}
-	if ( ! $location ){
+	if (!$location){
 		$location=$default_location;
 	}
 	return $location;
@@ -4106,19 +4374,19 @@ sub set_man_location {
 # the values from the UPDATED file, NOT the running program!
 sub set_version_data {
 	open(my $fh, '<', "$self_path/$self_name");
-	while( my $row = <$fh>){
+	while (my $row = <$fh>){
 		chomp($row);
 		$row =~ s/'|;//g;
-		if ($row =~ /^my \$self_name/ ){
+		if ($row =~ /^my \$self_name/){
 			$self_name = (split('=', $row))[1];
 		}
-		elsif ($row =~ /^my \$self_version/ ){
+		elsif ($row =~ /^my \$self_version/){
 			$self_version = (split('=', $row))[1];
 		}
-		elsif ($row =~ /^my \$self_date/ ){
+		elsif ($row =~ /^my \$self_date/){
 			$self_date = (split('=', $row))[1];
 		}
-		elsif ($row =~ /^my \$self_patch/ ){
+		elsif ($row =~ /^my \$self_patch/){
 			$self_patch = (split('=', $row))[1];
 		}
 		elsif ($row =~ /^## END INXI INFO/){
@@ -4132,12 +4400,16 @@ sub set_version_data {
 #### OPTIONS HANDLER / VERSION
 ########################################################################
 
-sub get_options {
+## OptionsHandler
+{
+package OptionsHandler;
+# note: had %trigger local but tripped odd perl 5.008 failures unless global
+# so moved to %use and %show globals.
+my ($self_download,$download_id);
+sub get {
 	eval $start if $b_log;
 	$show{'short'} = 1;
-	my ($b_downloader,$b_help,$b_no_man,$b_no_man_force,$b_sensors_default,
-	$b_recommends,$b_updater,$b_version,$b_use_man,$self_download, $download_id);
-	GetOptions (
+	Getopt::Long::GetOptions (
 	'a|admin' => sub {
 		$b_admin = 1;},
 	'A|audio' => sub {
@@ -4161,14 +4433,14 @@ sub get_options {
 		$show{'battery-forced'} = 1; },
 	'c|color:i' => sub {
 		my ($opt,$arg) = @_;
-		if ( $arg >= 0 && $arg < get_color_scheme('count') ){
-			set_color_scheme($arg);
+		if ($arg >= 0 && $arg < main::get_color_scheme('count')){
+			main::set_color_scheme($arg);
 		}
-		elsif ( $arg >= 94 && $arg <= 99 ){
+		elsif ($arg >= 94 && $arg <= 99){
 			$colors{'selector'} = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
 	'C|cpu' => sub {
 		$show{'short'} = 0;
@@ -4211,33 +4483,31 @@ sub get_options {
 		$show{'graphic'} = 1; 
 		$show{'graphic-basic'} = 1; },
 	'h|help|?' => sub {
-		$b_help = 1; },
+		$show{'help'} = 1; },
 	'i|ip' => sub {
 		$show{'short'} = 0;
 		$show{'ip'} = 1;
 		$show{'network'} = 1;
 		$show{'network-advanced'} = 1;
-		$b_downloader = 1 if ! check_program('dig');},
+		$use{'downloader'} = 1 if ! main::check_program('dig');},
 	'I|info' => sub {
 		$show{'short'} = 0;
 		$show{'info'} = 1; },
 	'j|swap|swaps' => sub {
 		$show{'short'} = 0;
-		$show{'swap'} = 1; },
+		$show{'swap'} = 1;},
 	'J|usb' => sub {
 		$show{'short'} = 0;
 		$show{'usb'} = 1; },
 	'l|labels|label' => sub {
-		$show{'short'} = 0;
-		$show{'label'} = 1;
-		$show{'partition'} = 1; },
+		$show{'label'} = 1;},
 	'limit:i' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg != 0){
 			$limit = $arg;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'L|logical|lvm' => sub {
 		$show{'short'} = 0;
@@ -4279,7 +4549,7 @@ sub get_options {
 			$show{'partition-sort'} = $arg;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'r|repos|repo' => sub {
 		$show{'short'} = 0;
@@ -4298,7 +4568,7 @@ sub get_options {
 			$cpu_sleep = $arg;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'slots|slot' => sub {
 		$show{'short'} = 0;
@@ -4312,7 +4582,7 @@ sub get_options {
 		$arg ||= 'cm';
 		my $num = $arg;
 		$num =~ s/^[cm]+// if $num;
-		if ( $arg =~ /^([cm]+)([0-9]+)?$/ && (!$num || $num =~ /^\d+/) ){
+		if ($arg =~ /^([cm]+)([0-9]+)?$/ && (!$num || $num =~ /^\d+/)){
 			$show{'process'} = 1;
 			if ($arg =~ /c/){
 				$show{'ps-cpu'} = 1;
@@ -4323,20 +4593,18 @@ sub get_options {
 			$ps_count = $num if $num;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'u|uuid' => sub {
-		$show{'short'} = 0;
-		$show{'partition'} = 1;
-		$show{'uuid'} = 1; },
+		$show{'uuid'} = 1;},
 	'v|verbosity:i' => sub {
 		my ($opt,$arg) = @_;
 		$show{'short'} = 0;
-		if ( $arg =~ /^[0-8]$/ ){
-			if ($arg == 0 ){
+		if ($arg =~ /^[0-8]$/){
+			if ($arg == 0){
 				$show{'short'} = 1;
 			}
-			if ($arg >= 1 ){
+			if ($arg >= 1){
 				$show{'cpu-basic'} = 1;
 				$show{'disk-total'} = 1;
 				$show{'graphic'} = 1;
@@ -4344,23 +4612,23 @@ sub get_options {
 				$show{'info'} = 1;
 				$show{'system'} = 1;
 			}
-			if ($arg >= 2 ){
+			if ($arg >= 2){
 				$show{'battery'} = 1;
 				$show{'disk-basic'} = 1;
 				$show{'raid-basic'} = 1;
 				$show{'machine'} = 1;
 				$show{'network'} = 1;
 			}
-			if ($arg >= 3 ){
+			if ($arg >= 3){
 				$show{'network-advanced'} = 1;
 				$show{'cpu'} = 1;
 				$extra = 1;
 			}
-			if ($arg >= 4 ){
+			if ($arg >= 4){
 				$show{'disk'} = 1;
 				$show{'partition'} = 1;
 			}
-			if ($arg >= 5 ){
+			if ($arg >= 5){
 				$show{'audio'} = 1;
 				$show{'bluetooth'} = 1;
 				$show{'ram'} = 1;
@@ -4372,25 +4640,26 @@ sub get_options {
 				$show{'swap'} = 1;
 				$show{'uuid'} = 1;
 			}
-			if ($arg >= 6 ){
+			if ($arg >= 6){
 				$show{'optical'} = 1;
 				$show{'partition-full'} = 1;
 				$show{'unmounted'} = 1;
 				$show{'usb'} = 1;
 				$extra = 2;
 			}
-			if ($arg >= 7 ){
-				$b_downloader = 1 if ! check_program('dig');
+			if ($arg >= 7){
+				$use{'downloader'} = 1 if !main::check_program('dig');
+				$show{'battery-forced'} = 1;
 				$show{'bluetooth-forced'} = 1;
 				$show{'cpu-flag'} = 1;
 				$show{'ip'} = 1;
+				$show{'logical'} = 1;
 				$show{'raid-forced'} = 1;
 				$extra = 3;
 			}
-			if ($arg >= 8 ){
+			if ($arg >= 8){
 				$b_admin = 1;
-				$b_downloader = 1;
-				$show{'logical'} = 1;
+				$use{'downloader'} = 1;
 				$show{'process'} = 1;
 				$show{'ps-cpu'} = 1;
 				$show{'ps-mem'} = 1;
@@ -4400,37 +4669,37 @@ sub get_options {
 			}
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'V|version' => sub { 
-		$b_version = 1 },
+		$show{'version'} = 1 },
 	'w|weather' => sub {
 		my ($opt) = @_;
 		$show{'short'} = 0;
-		$b_downloader = 1;
-		if ( $use{'weather'} ){
+		$use{'downloader'} = 1;
+		if ($use{'weather'}){
 			$show{'weather'} = 1;
 		}
 		else {
-			error_handler('distro-block', $opt);
+			main::error_handler('distro-block', $opt);
 		} },
 	'W|weather-location:s' => sub {
 		my ($opt,$arg) = @_;
 		$arg ||= '';
 		$arg =~ s/\s//g;
 		$show{'short'} = 0;
-		$b_downloader = 1;
-		if ( $use{'weather'} ){
+		$use{'downloader'} = 1;
+		if ($use{'weather'}){
 			if ($arg){
 				$show{'weather'} = 1;
 				$show{'weather-location'} = $arg;
 			}
 			else {
-				error_handler('bad-arg',$opt,$arg);
+				main::error_handler('bad-arg',$opt,$arg);
 			}
 		}
 		else {
-			error_handler('distro-block', $opt);
+			main::error_handler('distro-block', $opt);
 		} },
 	'ws|weather-source:s' => sub {
 		my ($opt,$arg) = @_;
@@ -4440,7 +4709,7 @@ sub get_options {
 			$weather_source = $arg;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'weather-unit:s' => sub {
 		my ($opt,$arg) = @_;
@@ -4453,7 +4722,7 @@ sub get_options {
 			$weather_unit = $arg;
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		} },
 	'x|extra:i' => sub {
 		my ($opt,$arg) = @_;
@@ -4465,18 +4734,18 @@ sub get_options {
 		} },
 	'y|width:i' => sub {
 		my ($opt, $arg) = @_;
-		if( defined $arg && $arg == -1){
+		if (defined $arg && $arg == -1){
 			$arg = 2000;
 		}
 		# note: :i creates 0 value if not supplied even though means optional
 		elsif (!$arg){
 			$arg = 80;
 		}
-		if ( $arg =~ /\d/ && ($arg == 1 || $arg >= 80) ){
-			set_display_width($arg);
+		if ($arg =~ /\d/ && ($arg == 1 || $arg >= 80)){
+			main::set_display_width($arg);
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
 	'z|filter' => sub {
 		$use{'filter'} = 1; },
@@ -4489,25 +4758,25 @@ sub get_options {
 	## Start non data options
 	'alt:i' => sub { 
 		my ($opt,$arg) = @_;
-		if ($arg == 40) {
+		if ($arg == 40){
 			$dl{'tiny'} = 0;
-			$b_downloader = 1;}
-		elsif ($arg == 41) {
+			$use{'downloader'} = 1;}
+		elsif ($arg == 41){
 			$dl{'curl'} = 0;
-			$b_downloader = 1;}
-		elsif ($arg == 42) {
+			$use{'downloader'} = 1;}
+		elsif ($arg == 42){
 			$dl{'fetch'} = 0;
-			$b_downloader = 1;}
-		elsif ($arg == 43) {
+			$use{'downloader'} = 1;}
+		elsif ($arg == 43){
 			$dl{'wget'} = 0;
-			$b_downloader = 1;}
-		elsif ($arg == 44) {
+			$use{'downloader'} = 1;}
+		elsif ($arg == 44){
 			$dl{'curl'} = 0;
 			$dl{'fetch'} = 0;
 			$dl{'wget'} = 0;
-			$b_downloader = 1;}
+			$use{'downloader'} = 1;}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'arm' => sub {
 		$b_arm = 1 },
@@ -4515,42 +4784,47 @@ sub get_options {
 		my ($opt,$arg) = @_;
 		if ($arg =~ /^(darwin|dragonfly|freebsd|openbsd|netbsd)$/i){
 			$bsd_type = lc($arg);
-			$b_fake_bsd = 1;
+			$fake{'bsd'} = 1;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}
 	},
-	'bsd-data:s' => sub { 
+	'bt-tool:s' => sub { 
 		my ($opt,$arg) = @_;
-		if ($arg =~ /^(dboot|pciconf|sysctl|usbdevs)$/i){
-			$b_fake_dboot = 1 if $arg eq 'dboot';
-			$b_fake_pciconf = 1 if $arg eq 'pciconf';
-			$b_fake_sysctl = 1 if $arg eq 'sysctl';
-			$b_fake_usbdevs = 1 if $arg eq 'usbdevs';
+		if ($arg =~ /^(bluetoothctl|bt-adapter|hciconfig|rfkill)$/i){
+			$bt_tool = lc($arg);
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}
 	},
 	'dbg:i' => sub { 
 		my ($opt,$arg) = @_;
-		if ($arg > 0) {
-			$test[$arg] = 1;
+		if ($arg > 0){
+			$dbg[$arg] = 1;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'debug:i' => sub { 
 		my ($opt,$arg) = @_;
 		if ($arg =~ /^[1-3]|1[0-3]|2[0-4]$/){
-			$debug=$arg;
+			$debugger{'level'} = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
-	'debug-filter|debug-z' => sub {
+	'debug-filter|debug-z|debug-zy' => sub {
 		$debugger{'filter'} = 1 },
+	'debug-id:s' => sub { 
+		my ($opt,$arg) = @_;
+		if ($arg){
+			$debugger{'id'} = $arg;
+		}
+		else {
+			main::error_handler('bad-arg', $opt, $arg);
+		} },
 	'debug-no-eps' => sub {
 		$debugger{'no-exit'} = 1;
 		$debugger{'no-proc'} = 1;
@@ -4570,16 +4844,17 @@ sub get_options {
 		$debugger{'sys-print'} = 1; },
 	'debug-test-1' => sub {
 		$debugger{'test-1'} = 1; },
-	'debug-width:i' => sub { 
+	'debug-width|debug-y|debug-zy:i' => sub { 
 		my ($opt,$arg) = @_;
+		$arg ||= 80;
 		if ($arg =~ /^[0-9]+$/ && ($arg == 1 || $arg >= 80)){
 			$debugger{'width'} = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
 	'dig' => sub {
-		$b_skip_dig = 0; },
+		$force{'no-dig'} = 0; },
 	'display:s' => sub { 
 		my ($opt,$arg) = @_;
 		if ($arg =~ /^:?([0-9\.]+)?$/){
@@ -4587,119 +4862,144 @@ sub get_options {
 			$display ||= ':0';
 			$display = ":$display" if $display !~ /^:/;
 			$b_display = ($b_root) ? 0 : 1;
-			$b_force_display = 1;
+			$force{'display'} = 1;
 			$display_opt = "-display $display";
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
-	'dmidecode' => sub {
-		$b_dmidecode_force = 1 },
+	'dmi|dmidecode' => sub {
+		$force{'dmidecode'} = 1 },
 	'downloader:s' => sub { 
 		my ($opt,$arg) = @_;
 		$arg = lc($arg);
 		if ($arg =~ /^(curl|fetch|ftp|perl|wget)$/){
-			if ($arg eq 'perl' && (!check_perl_module('HTTP::Tiny') || !check_perl_module('IO::Socket::SSL') )){
-				error_handler('missing-perl-downloader', $opt, $arg);
+			if ($arg eq 'perl' && (!main::check_perl_module('HTTP::Tiny') || 
+			 !main::check_perl_module('IO::Socket::SSL'))){
+				main::error_handler('missing-perl-downloader', $opt, $arg);
 			}
-			elsif ( !check_program($arg)) {
-				error_handler('missing-downloader', $opt, $arg);
+			elsif (!main::check_program($arg)){
+				main::error_handler('missing-downloader', $opt, $arg);
 			}
 			else {
 				# this dumps all the other data and resets %dl for only the
 				# desired downloader.
-				$arg = set_perl_downloader($arg);
+				$arg = main::set_perl_downloader($arg);
 				%dl = ('dl' => $arg, $arg => 1);
-				$b_downloader = 1;
+				$use{'downloader'} = 1;
 			}
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		} },
-	'fake-cpu' => sub {
-		$b_fake_cpu = 1 },
-	'fake-dmi' => sub {
-		$b_fake_dmidecode = 1 },
-	'fake-logical' => sub {
-		$b_fake_logical = 1 },
-	'fake-raid' => sub {
-		$b_fake_raid = 1 },
-	'fake-sensors' => sub {
-		$b_fake_sensors = 1 },
+	'fake:s' => sub {
+		my ($opt,$arg) = @_;
+		if ($arg){
+			my $wl = 'bluetooth|compiler|cpu|dboot|dmidecode|ipmi|logical|pciconf|';
+			$wl .= 'pcictl|pcidump|raid-btrfs|raid-hw|raid-lvm|raid-md|raid-soft|';
+			$wl .= 'raid-zfs|sensors|sysctl|uptime|usbconfig|usbdevs|vmstat|xorg-log';
+			for (split(',',$arg)){
+				if ($_ =~ /\b($wl)\b/){
+					$fake{lc($1)} = 1;
+				}
+				else {
+					main::error_handler('bad-arg', $opt, $_);
+				}
+			}
+		}
+		else {
+			main::error_handler('bad-arg', $opt, $arg);
+		}},
+	'force:s' => sub {
+		my ($opt,$arg) = @_;
+		if ($arg){
+			my $wl = 'display|dmidecode|hddtemp|lsusb|man|meminfo|no-dig|';
+			$wl .= 'no-doas|no-html-wan|no-sudo|pkg|usb-sys|vmstat|wmctrl';
+			for (split(',',$arg)){
+				if ($_ =~ /\b($wl)\b/){
+					$force{lc($1)} = 1;
+				}
+				else {
+					main::error_handler('bad-arg', $opt, $_);
+				}
+			}
+		}
+		else {
+			main::error_handler('bad-arg', $opt, $arg);
+		}},
 	'ftp:s'  => sub { 
 		my ($opt,$arg) = @_;
 		# pattern: ftp.x.x/x
-		if ($arg =~ /^ftp\..+\..+\/[^\/]+$/ ){
+		if ($arg =~ /^ftp\..+\..+\/[^\/]+$/){
 			$ftp_alt = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'hddtemp' => sub {
-		$b_hddtemp_force = 1 },
+		$force{'hddtemp'} = 1 },
 	'host|hostname' => sub {
 		$show{'host'} = 1;
 		$show{'no-host'} = 0},
 	'html-wan' => sub {
-		$b_no_html_wan = 0; },
+		$force{'no-html-wan'} = 0; },
 	'irc' => sub {
 		$b_irc = 1; },
 	'man' => sub {
-		$b_use_man = 1; },
+		$use{'yes-man'} = 1; },
 	'mips' => sub {
 		$b_mips = 1 },
 	'output:s' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg =~ /^(json|screen|xml)$/){
-			if ($arg =~ /json|screen|xml/){
-				$output_type = $arg;
-			}
-			else {
-				error_handler('option-feature-incomplete', $opt, $arg);
-			}
+			$output_type = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'no-dig' => sub {
-		$b_skip_dig = 1; },
+		$force{'no-dig'} = 1; },
+	'no-doas' => sub {
+		$force{'no-doas'} = 1; },
 	'no-host|no-hostname' => sub {
 		$show{'host'} = 0 ;
 		$show{'no-host'} = 1},
 	'no-html-wan' => sub {
-		$b_no_html_wan= 1;},
+		$force{'no-html-wan'}= 1;},
 	'no-man' => sub {
-		$b_no_man_force = 0; },
+		$use{'no-man'} = 0; },
 	'no-ssl' => sub {
 		$dl{'no-ssl-opt'}=1 },
 	'no-sudo' => sub {
-		$b_no_sudo = 1; },
+		$force{'no-sudo'} = 1; },
 	'output-file:s' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg){
-			if ($arg eq 'print' || check_output_path($arg)){
+			if ($arg eq 'print' || main::check_output_path($arg)){
 				$output_file = $arg;
 			}
 			else {
-				error_handler('output-file-bad', $opt, $arg);
+				main::error_handler('output-file-bad', $opt, $arg);
 			}
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
+	'pkg' => sub {
+		$force{'pkg'} = 1 },
 	'ppc' => sub {
 		$b_ppc = 1 },
 	'recommends' => sub {
-		$b_recommends = 1; },
+		$show{'recommends'} = 1;},
 	'sensors-default' => sub {
-		$b_sensors_default = 1; },
+		$use{'sensors-default'} = 1; },
 	'sensors-exclude:s' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg){
 			@sensors_exclude = split(/\s*,\s*/, $arg);
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		}},
 	'sensors-use:s' => sub {
 		my ($opt,$arg) = @_;
@@ -4707,7 +5007,7 @@ sub get_options {
 			@sensors_use = split(/\s*,\s*/, $arg);
 		}
 		else {
-			error_handler('bad-arg',$opt,$arg);
+			main::error_handler('bad-arg',$opt,$arg);
 		}},
 	'sparc' => sub {
 		$b_sparc = 1; },
@@ -4717,112 +5017,102 @@ sub get_options {
 		$b_irc = 0; },
 	'U|update:s' => sub { # 1,2,3 OR http://myserver/path/inxi
 		my ($opt,$arg) = @_;
-		$b_downloader = 1;
-		if ( $use{'update'} ){
-			$b_updater = 1;
-			if (!$arg && $self_name eq 'pinxi'){
-				$b_man = 1;
-				$download_id = 'inxi-perl branch';
-				$self_download = get_defaults('inxi-pinxi');
-			}
-			elsif ($arg && $arg eq '3'){
-				$b_man = 1;
-				$download_id = 'dev server';
-				$self_download = get_defaults('inxi-dev');
-			}
-			else {
-				if (!$arg){
-					$download_id = 'main branch';
-					$self_download = get_defaults('inxi-main');
-					$b_man = 1;
-					$b_use_man = 1;
-				}
-				elsif ( $arg =~ /^[12]$/){
-					$download_id = "branch $arg";
-					$self_download = get_defaults("inxi-branch-$arg");
-				}
-				elsif ( $arg =~ /^http/){
-					$download_id = 'alt server';
-					$self_download = $arg;
-				}
-			}
-			if (!$self_download){
-				error_handler('bad-arg', $opt, $arg);
-			}
-		}
-		else {
-			error_handler('distro-block', $opt);
-		} },
+		process_updater($opt,$arg);},
 	'usb-sys' => sub {
-		$b_usb_sys = 1 },
+		$force{'usb-sys'} = 1 },
 	'usb-tool' => sub {
-		$b_usb_tool = 1 },
+		$force{'lsusb'} = 1 },
 	'wan-ip-url:s' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg && $arg =~ /^(f|ht)tp[s]?:\/\//){
 			$wan_url = $arg;
-			$b_skip_dig = 1
+			$force{'no-dig'} = 1;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'wm' => sub { 
-		$b_wmctrl = 1 },
+		$force{'wmctrl'} = 1 },
 	'wrap-max|indent-min:i' => sub {
 		my ($opt,$arg) = @_;
 		if ($arg =~ /^\d+$/){
 			$size{'wrap-max'} = $arg;
 		}
 		else {
-			error_handler('bad-arg', $opt, $arg);
+			main::error_handler('bad-arg', $opt, $arg);
 		}},
 	'<>' => sub {
 		my ($opt) = @_;
-		error_handler('unknown-option', "$opt", "" ); }
-	) ; #or error_handler('unknown-option', "@ARGV", '');
-	## run all these after so that we can change widths, downloaders, etc
-	eval $end if $b_log;
-	CheckRecommends::run() if $b_recommends;
-	set_downloader() if $b_downloader || $wan_url || ($b_skip_dig && $show{'ip'}); # sets for either config or arg here
-	set_xorg_log() if $show{'graphic'};
-	show_version() if $b_version;
-	show_options() if $b_help;
-	$b_man = 0 if (!$b_use_man || $b_no_man_force);
-	update_me( $self_download, $download_id ) if $b_updater;
+		main::error_handler('unknown-option', "$opt", "");}
+	); # or error_handler('unknown-option', "@ARGV", '');
+	# run all these after so that we can change widths, downloaders, etc
+	# print Data::Dumper::Dumper \%trigger;
+	post_process();
+	eval $end if $b_log;
+}
+sub post_process {
+	CheckRecommends::run() if $show{'recommends'};
+	# sets for either config or arg here
+	if ($use{'downloader'} || $wan_url || ($force{'no-dig'} && $show{'ip'})){
+		main::set_downloader();
+	}
+	main::set_xorg_log() if $show{'graphic'};
+	main::show_version() if $show{'version'};
+	main::show_options() if $show{'help'};
+	$use{'man'} = 0 if (!$use{'yes-man'} || $use{'no-man'});
+	main::update_me($self_download, $download_id) if $use{'update-trigger'};
+	if ($b_pledge){
+		my $b_update;
+		# if -c 9x, remove in SelectColors::set_selection(), else remove here
+		if (!$colors{'selector'} && $debugger{'level'} < 21){
+			@pledges = grep {$_ ne 'getpw'} @pledges; 
+			$b_update = 1;
+		}
+		if ($debugger{'level'} < 21){ # remove ftp upload
+			@pledges = grep {!/(dns|inet)/} @pledges;
+			$b_update = 1;
+		}
+		# not writing/creating .inxi data dirs colors selector launches set_color()
+		if (!$show{'weather'} && !$colors{'selector'} && $debugger{'level'} < 10 && 
+		 $output_type eq 'screen'){ 
+			@pledges = grep {!/(cpath|wpath)/} @pledges;
+			$b_update = 1;
+		}
+		OpenBSD::Pledge::pledge(@pledges) if $b_update;
+	}
 	if ($output_type){
-		if ($output_type ne 'screen' && ! $output_file){
-			error_handler('bad-arg', '--output', '--output-file not provided');
+		if ($output_type ne 'screen' && !$output_file){
+			main::error_handler('bad-arg', '--output', '--output-file not provided');
 		}
 	}
+	if (($show{'label'} || $show{'uuid'}) && !$show{'partition'} && 
+	 !$show{'partition-full'} && !$show{'swap'} && !$show{'unmounted'}){
+		main::error_handler('bad-arg', '-l/-u', 'missing required option(s) -j, -o, -p, -P');
+	}
 	$show{'graphic-basic'} = 0 if $b_admin;
-	if ($b_sensors_default){
+	if ($use{'sensors-default'}){
 		@sensors_exclude = ();
 		@sensors_use = ();
 	}
 	if ($show{'short'} || $show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} || 
 	    $show{'logical'} || $show{'partition'} || $show{'partition-full'} || $show{'raid'} || 
 	    $show{'unmounted'}){
-		$b_block_tool = 1;
+		$use{'block-tool'} = 1;
 	}
 	if ($show{'raid'} || $show{'disk'} || $show{'disk-total'} || $show{'disk-basic'} 
 	 || $show{'unmounted'}){
-		$b_mdadm = 1;
-	}
-	if ($bsd_type && ($show{'short'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'disk'})){
-		$b_dm_boot_disk = 1;
-	}
-	if ($bsd_type && ($show{'optical-basic'} || $show{'optical'})){
-		$b_dm_boot_optical = 1
+		$use{'btrfs'} = 1;
+		$use{'mdadm'} = 1;
 	}
 	if ($b_admin && $show{'disk'}){
-		$b_smartctl = 1;
+		$use{'smartctl'} = 1;
 	}
 	# triggers may extend to -D, -pP
 	if ($show{'short'} || $show{'logical'} || $show{'raid'} || $show{'disk'} || 
 	    $show{'disk-total'} || $show{'disk-basic'} || $show{'unmounted'}){
-		$b_lvm = 1;
+		$use{'logical'} = 1;
 	}
-	set_sudo() if ( $show{'unmounted'} || ($extra > 0 && $show{'disk'}) );
+	main::set_sudo() if ($show{'unmounted'} || ($extra > 0 && $show{'disk'}));
 	$extra = 3 if $b_admin;
 	$use{'filter'} = 0 if $use{'filter-override'};
 	# override for things like -b or -v2 to -v3
@@ -4831,25 +5121,95 @@ sub get_options {
 	$show{'partition'} = 0 if $show{'partition-full'};
 	$show{'host'} = 0 if $show{'no-host'};
 	$show{'host'} = 1 if ($show{'host'} || (!$use{'filter'} && !$show{'no-host'}));
-	if ($show{'disk'} || $show{'optical'} ){
+	if ($show{'disk'} || $show{'optical'}){
 		$show{'disk-basic'} = 0;
 		$show{'disk-total'} = 0;
 	}
-	if ( $show{'ram'} || $show{'slot'} || ($show{'cpu'} && $extra > 1) ||
-	     ( ( $bsd_type || $b_dmidecode_force ) && ($show{'machine'} || $show{'battery'}) ) ){
-		$b_dmi = 1;
+	if ($show{'ram'} || $show{'slot'} || ($show{'cpu'} && ($extra > 1 || $bsd_type)) || 
+	 (($bsd_type || $force{'dmidecode'}) && ($show{'machine'} || $show{'battery'}))){
+		$use{'dmidecode'} = 1;
 	}
-	if ($show{'audio'} || $show{'graphic'} || $show{'network'} || $show{'raid'} ){
-		$b_pci = 1;
+	if ($show{'audio'} || $show{'bluetooth'} || $show{'graphic'} || 
+	 $show{'network'} || $show{'raid'}){
+		$use{'pci'} = 1;
 	}
-	if ($show{'usb'} || $show{'audio'} || $show{'bluetooth'} || $show{'graphic'} || $show{'network'} ){
-		$b_usb = 1;
+	if ($show{'usb'} || $show{'audio'} || $show{'bluetooth'} || 
+	 $show{'graphic'} || $show{'network'}){
+		$use{'usb'} = 1;
 	}
-	if ($bsd_type && ($show{'short'} || $show{'system'} || $show{'battery'} || $show{'cpu'} || $show{'cpu-basic'} || 
-	   $show{'info'} || $show{'machine'} || $show{'process'} || $show{'ram'}  || $show{'sensor'} ) ){
-		$b_sysctl = 1;
+	if ($bsd_type){
+		if ($show{'audio'}){
+			$use{'bsd-audio'} = 1;}
+		if ($show{'battery'}){
+			$use{'bsd-battery'} = 1;}
+		if ($show{'short'} || $show{'cpu-basic'} || $show{'cpu'}){
+			$use{'bsd-cpu'} = 1;
+			$use{'bsd-sleep'} = 1;}
+		if ($show{'short'} || $show{'disk-basic'} || $show{'disk-total'} || 
+		 $show{'disk'} || $show{'partition'} || $show{'partition-full'} || 
+		 $show{'raid'} || $show{'swap'} || $show{'unmounted'}){
+			$use{'bsd-disk'} = 1;
+			$use{'bsd-partition'} = 1;
+			$use{'bsd-raid'} = 1;}
+		if ($show{'system'}){
+			$use{'bsd-kernel'} = 1;}
+		if ($show{'machine'}){
+			$use{'bsd-machine'} = 1;}
+		if ($show{'short'} || $show{'info'} || $show{'ps-mem'} || $show{'ram'}){
+			$use{'bsd-memory'} = 1;}
+		if ($show{'optical-basic'} || $show{'optical'}){
+			$use{'bsd-optical'} = 1;}
+		# strictly only used to fill in pci drivers if tool doesn't support that
+		if ($use{'pci'}){
+			$use{'bsd-pci'} = 1;}
+		if ($show{'raid'}){
+			$use{'bsd-ram'} = 1;}
+		if ($show{'sensor'}){
+			$use{'bsd-sensor'} = 1;}
+		# always use this, it's too core
+		$use{'sysctl'} = 1;
+	}
+}
+sub process_updater {
+	my ($opt,$arg) = @_;
+	$use{'downloader'} = 1;
+	if ($use{'update'}){
+		$use{'update-trigger'} = 1;
+		if (!$arg && $self_name eq 'pinxi'){
+			$use{'man'} = 1;
+			$download_id = 'inxi-perl branch';
+			$self_download = main::get_defaults('inxi-pinxi');
+		}
+		elsif ($arg && $arg eq '3'){
+			$use{'man'} = 1;
+			$download_id = 'dev server';
+			$self_download = main::get_defaults('inxi-dev');
+		}
+		else {
+			if (!$arg){
+				$download_id = 'main branch';
+				$self_download = main::get_defaults('inxi-main');
+				$use{'man'} = 1;
+				$use{'yes-man'} = 1;
+			}
+			elsif ($arg =~ /^[12]$/){
+				$download_id = "branch $arg";
+				$self_download = main::get_defaults("inxi-branch-$arg");
+			}
+			elsif ($arg =~ /^http/){
+				$download_id = 'alt server';
+				$self_download = $arg;
+			}
+		}
+		if (!$self_download){
+			main::error_handler('bad-arg', $opt, $arg);
+		}
 	}
-} 
+	else {
+		main::error_handler('distro-block', $opt);
+	} 
+}
+}
 
 sub show_options {
 	error_handler('not-in-irc', 'help') if $b_irc;
@@ -4859,12 +5219,12 @@ sub show_options {
 	my $partition_string='partition';
 	my $partition_string_u='Partition';
 	my $flags = ($b_arm) ? 'features' : 'flags' ;
-	if ( $bsd_type ){
+	if ($bsd_type){
 		$partition_string='slice';
 		$partition_string_u='Slice';
 	}
 	# fit the line to the screen!
-	for my $i ( 0 .. ( ( $size{'max'} / 2 ) - 2 ) ){
+	for my $i (0 .. (($size{'max'} / 2) - 2)){
 		$line = $line . '- ';
 	}
 	push(@data, 
@@ -4882,10 +5242,10 @@ sub show_options {
 	$self_name^-FzjJxy^80" ],
 	['0', '', '', $line ],
 	['0', '', '', "Output Control Options (see Extra Data Options to extend output):" ],
-	['1', '-A', '--audio', "Audio/sound devices(s), driver, sound server." ],
+	['1', '-A', '--audio', "Audio/sound devices(s), driver, running sound servers." ],
 	['1', '-b', '--basic', "Basic output, short form. Same as $self_name^-v^2." ],
-	['1', '-B', '--battery', "System battery info, including charge and condition, plus 
-	extra info (if battery present)." ],
+	['1', '-B', '--battery', "System battery info, including charge, condition
+	voltage (if critical), plus extra info (if battery present/detected)." ],
 	['1', '-c', '--color', "Set color scheme (0-42). For piped or redirected output,
 	you must use an explicit color selector. Example:^$self_name^-c^11" ],
 	['1', '', '', "Color selectors let you set the config file value for the 
@@ -4921,8 +5281,7 @@ sub show_options {
 	IRC client or shell type, $self_name version." ],
 	['1', '-j', '--swap', "Swap in use. Includes ${partition_string}s, zram, file." ],
 	['1', '-J', '--usb', "Show USB data: Hubs and Devices." ],
-	['1', '-l', '--label', "$partition_string_u labels. Triggers -P. 
-	For full -p output, use -pl." ],
+	['1', '-l', '--label', "$partition_string_u labels. Use with -j, -o, -p, -P." ],
 	['1', '-L', '--logical', "Logical devices, LVM (VG, LV), 
 	LUKS, Crypto, bcache, etc. Shows components/devices, sizes, etc." ],
 	['1', '-m', '--memory', "Memory (RAM) data. Requires root. Numbers of 
@@ -4942,7 +5301,7 @@ sub show_options {
 	['1', '-o', '--unmounted', "Unmounted $partition_string info (includes UUID 
 	and Label if available). Shows file system type if you have lsblk installed 
 	(Linux) or, for BSD/GNU Linux, if 'file' installed and you are root or if 
-	you have added to /etc/sudoers (sudo v. 1.7 or newer)." ],
+	you have added to /etc/sudoers (sudo v. 1.7 or newer)(BSDs: see doas)." ],
 	['1', '', '', "Example: ^<username>^ALL^=^NOPASSWD:^/usr/bin/file^" ],
 	['1', '-p', '--partitions-full', "Full $partition_string information (-P plus all other 
 	detected ${partition_string}s)." ],
@@ -4951,8 +5310,8 @@ sub show_options {
 	${partition_string}s show if --swap is not used. Use -p to see all 
 	mounted ${partition_string}s." ],
 	['1', '-r', '--repos', "Distro repository data. Supported repo types: APK, 
-	APT, CARDS, EOPKG, PACMAN, PACMAN-G2, PISI, PORTAGE, PORTS (BSDs), SLACKPKG,
-	TCE, URPMQ, XBPS, YUM/ZYPP." ],
+	APT, CARDS, EOPKG, NIX, PACMAN, PACMAN-G2, PISI, PKG (BSDs), PORTAGE, PORTS 
+	(BSDs), SCRATCHPKG, SLACKPKG, TCE, URPMQ, XBPS, YUM/ZYPP." ],
 	['1', '-R', '--raid', "RAID data. Shows RAID devices, states, levels, array sizes,
 	and components. md-raid: If device is resyncing, also shows resync progress line." ],
 	['1', '-s', '--sensors', "Sensors output (if sensors installed/configured): 
@@ -4966,8 +5325,7 @@ sub show_options {
 	of processes for each type (default: 5; if in IRC, max: 5). " ],
 	['1', '', '', "Make sure that there is no space between letters and 
 	numbers (e.g.^-t^cm10)." ],
-	['1', '-u', '--uuid', "$partition_string_u UUIDs. Triggers -P. For full -p 
-	output, use -pu." ],
+	['1', '-u', '--uuid', "$partition_string_u UUIDs.  Use with -j, -o, -p, -P." ],
 	['1', '-v', '--verbosity', "Set $self_name verbosity level (0-8). 
 	Should not be used with -b or -F. Example: $self_name^-v^4" ],
 	['2', '0', '', "Same as: $self_name" ],
@@ -4985,16 +5343,16 @@ sub show_options {
 	['2', '6', '', "Full $partition_string (-p), 
 	unmounted $partition_string (-o), optical drive (-d), USB (-J),
 	full RAID; triggers -xx." ], 
-	['2', '7', '', "Network IP data (-i), bluetooth and RAID forced; 
-	triggers -xxx."],
-	['2', '8', '', "Everything available, including logical (-L), 
-	repos (-r), processes (-tcm), PCI slots (--slots); triggers admin (-a)."],
+	['2', '7', '', "Network IP data (-i), bluetooth, logical (-L), 
+	RAID forced; triggers -xxx."],
+	['2', '8', '', "Everything available, including	repos (-r), 
+	processes (-tcm), PCI slots (--slots); triggers admin (-a)."],
 	);
 	# if distro maintainers don't want the weather feature disable it
-	if ( $use{'weather'} ){
+	if ($use{'weather'}){
 		push(@data, 
 		['1', '-w', '--weather', "Local weather data/time. To check an alternate
-		location, see -W. NO AUTOMATED QUERIES ALLOWED!"],
+		location, see -W. NO AUTOMATED QUERIES OR EXCESSIVE USE ALLOWED!"],
 		['1', '-W', '--weather-location', "[location] Supported options for 
 		[location]: postal code[,country/country code]; city, state (USA)/country 
 		(country/two character country code); latitude, longitude. Only use if you 
@@ -5027,7 +5385,7 @@ sub show_options {
 	['2', '-A', '', "If available: list of alternate kernel modules/drivers 
 	for device(s)." ],
 	['2', '-C', '', "If available: CPU socket type, base/boost speeds 
-	(dmidecode+root/sudo required); CPU vulnerabilities (bugs); 
+	(dmidecode+root/sudo/doas[BSDs] required); CPU vulnerabilities (bugs); 
 	family, model-id, stepping - format: hex (decimal) if greater 
 	than 9, otherwise hex; microcode - format: hex." ],
 	['2', '-d,-D', '', "If available: logical and physical block sizes; drive family;
@@ -5039,7 +5397,8 @@ sub show_options {
 	resolution; hz; dpi; size; diagonal; list of alternate kernel modules/drivers
 	for device(s)." ],
 	['2', '-I', '', "As well as per package manager counts, also adds total
-	number of lib files found for each package manager if not -r." ],
+	number of lib files found for each package manager if not -r; adds init
+	service tool." ],
 	['2', '-j,-p,-P', '', "For swap (if available): swappiness and vfs cache 
 	pressure, and if values are default or not." ],
 	['2', '-L', '', "LV, Crypto, devices, components: add maj:min; show
@@ -5056,9 +5415,10 @@ sub show_options {
 	['1', '-x', '--extra', "Adds the following extra data (only works with 
 	verbose or line output, not short form):" ],
 	['2', '-A', '', "Specific vendor/product information (if relevant); 
-	PCI/USB ID of device; Version/port(s)/driver version (if available)." ],
-	['2', '-B', '', "Vendor/model, status (if available); attached devices 
-	(e.g. wireless mouse, keyboard, if present)." ],
+	PCI/USB ID of device; Version/port(s)/driver version (if available);
+	non-running sound servers." ],
+	['2', '-B', '', "Current/minimum voltage, vendor/model, status (if available); 
+	attached devices (e.g. wireless mouse, keyboard, if present)." ],
 	['2', '-C', '', "CPU $flags (short list, use -f to see full list);
 	CPU boost (turbo) enabled/disabled, if present; 
 	Bogomips on CPU; CPU microarchitecture + 	revision (if found, or 
@@ -5068,7 +5428,7 @@ sub show_options {
 	['2', '-D', '', "HDD temp with disk data. Kernels >= 5.6: enable module
 	drivetemp if not enabled. Older systems require hddtemp, run as
 	as superuser, or as user if you have added hddtemp to /etc/sudoers
-	(sudo v. 1.7 or newer). 
+	(sudo v. 1.7 or newer)(BSDs see doas). 
 	Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp" ],
 	['2', '-E', '', "PCI/USB Bus ID of device, driver version, 
 	LMP version." ],
@@ -5091,14 +5451,14 @@ sub show_options {
 	['2', '-r', '', "Packages, see -Ix." ],
 	['2', '-R', '', "md-raid: second RAID Info line with extra data: 
 	blocks, chunk size, bitmap (if present). Resync line, shows blocks 
-	synced/total blocks. Hardware RAID driver version, bus ID." ],
+	synced/total blocks. Hardware RAID driver version, bus-ID." ],
 	['2', '-s', '', "Basic voltages (ipmi, lm-sensors if present): 12v, 5v, 3.3v, vbat." ],
 	['2', '-S', '', "Kernel gcc version; system base of distro (if relevant 
 	and detected)" ],
 	['2', '-t', '', "Adds memory use output to CPU (-xt c), and CPU use to 
 	memory (-xt m)." ],
 	);
-	if ( $use{'weather'} ){
+	if ($use{'weather'}){
 		push(@data, 
 		['2', '-w,-W', '', "Wind speed and direction, humidity, pressure, 
 		and time zone, if available." ]);
@@ -5108,10 +5468,10 @@ sub show_options {
 	['1', '-xx', '--extra 2', "Show extra, extra data (only works with verbose 
 	or line output, not short form):" ],
 	['2', '-A', '', "Chip vendor:product ID for each audio device." ],
-	['2', '-B', '', "Serial number, voltage now/minimum (if available)." ],
+	['2', '-B', '', "Serial number." ],
 	['2', '-C', '', "L1/L3 cache (if root and dmidecode installed)." ],
 	['2', '-D', '', "Disk transfer speed; NVMe lanes; Disk serial number; LVM 
-	volume group free space (if available)." ],
+	volume group free space (if available); disk duid (some BSDs)." ],
 	['2', '-E', '', "Chip vendor:product ID, LMP subversion." ],
 	['2', '-G', '', "Chip vendor:product ID for each video device; OpenGL 
 	compatibility version, if free drivers and available; Xorg compositor;
@@ -5121,9 +5481,9 @@ sub show_options {
 	['2', '-I', '', "Other detected installed gcc versions (if present). System 
 	default runlevel. Adds parent program (or tty) for shell info if not in 
 	IRC. Adds Init version number, RC (if found). Adds per package manager
-	package counts if not -r." ],
+	installed package counts if not -r." ],
 	['2', '-j,-p,-P', '', "Swap priority." ],
-	['2', '-J', '', "Vendor:chip ID." ],
+	['2', '-J', '', "Vendor:chip-ID." ],
 	['2', '-L', '', "Show internal LVM volumes, like raid image/meta volumes;
 	for LVM RAID, adds RAID report line (if not -R); show all components >
 	devices, number of 'c' or 'p' indicate depth of device." ],
@@ -5139,7 +5499,7 @@ sub show_options {
 	if available (Xfce/KDE/Trinity only)." ],
 	['2', '--slots', '', "Slot length." ],
 	);
-	if ( $use{'weather'} ){
+	if ($use{'weather'}){
 		push(@data,
 		['2', '-w,-W', '', "Snow, rain, precipitation, (last observed hour), 
 		cloud cover, wind chill, dew point, heat index, if available." ]
@@ -5153,13 +5513,13 @@ sub show_options {
 	['2', '-B', '', "Chemistry, cycles, location (if available)." ],
 	['2', '-C', '', "CPU voltage, external clock speed (if root and dmidecode installed)." ],
 	['2', '-D', '', "Firmware rev. if available; partition scheme, in some cases; disk 
-	rotation speed/SSD (if detected)." ],
+	type, rotation rpm (if available)." ],
 	['2', '-E', '', "Serial number, class ID, HCI version and revision." ],
 	['2', '-G', '', "Serial number, class ID." ],
-	['2', '-I', '', "For 'Shell:' adds ([su|sudo|login]) to shell name if present; 
+	['2', '-I', '', "For 'Shell:' adds ([doas|su|sudo|login]) to shell name if present; 
 	adds default shell+version if different; for 'running in:' adds (SSH) if SSH session;
 	adds wakeups: (from suspend) to Uptime." ],
-	['2', '-J', '', "For Device: serial number (if present), interface count; USB speed." ],
+	['2', '-J', '', "If present: Devices: serial number, interface count; USB speed; max power." ],
 	['2', '-m,--memory-modules', '', "Width of memory bus, data and total (if present and greater 
 	than data); Detail for Type, if present; module voltage, if available; serial 
 	number." ],
@@ -5169,9 +5529,9 @@ sub show_options {
 	Hardware RAID rev, ports, specific vendor/product information." ],
 	['2', '-S', '', "Panel/tray/bar/dock info in desktop output, if in X (like lxpanel, 
 	xfce4-panel, mate-panel); (if available) dm version number, window manager
-	version number."],
+	version number, virtual terminal number."],
 	);
-	if ( $use{'weather'} ){
+	if ($use{'weather'}){
 		push(@data, 
 		['2', '-w,-W', '', "Location (uses -z/irc filter), weather observation 
 		time, altitude, sunrise/sunset, if available." ] 
@@ -5185,7 +5545,7 @@ sub show_options {
  	and directories, then shows what package(s) you need to install to add support 
  	for that feature." ],
 	);
-	if ( $use{'update'} ){
+	if ($use{'update'}){
 		push(@data, 
 		['1', '-U', '--update', "Auto-update $self_name. Will also install/update man 
 		page. Note: if you installed as root, you must be root to update, otherwise 
@@ -5210,30 +5570,37 @@ sub show_options {
 	['2', '43', '', "Bypass Wget as a downloader option." ],
 	['2', '44', '', "Bypass Curl, Fetch, and Wget as downloader options. Forces 
 	Perl if HTTP::Tiny present." ],
+	['1', '', '--bt-tool', "[bt-adapter|hciconfig|rfkill] Force use of given tool for 
+	bluetooth report." ],
 	['1', '', '--dig', "Overrides configuration item NO_DIG (resets to default)." ],
 	['1', '', '--display', "[:[0-9]] Try to get display data out of X (default: display 0)." ],
 	['1', '', '--dmidecode', "Force use of dmidecode data instead of /sys where relevant 
 	(e.g. -M, -B)." ],
 	['1', '', '--downloader', "Force $self_name to use [curl|fetch|perl|wget] for downloads." ],
+	['1', '', '--force', "[dmidecode|hddtemp|lsusb|meminfo|usb-sys|vmstat|wmctl]. 1 or more
+	in comma separated list. Force use of item(s). 
+	See --hddtemp, --dmidecode, --wm, --usb-tool, --usb-sys." ],
 	['1', '', '--hddtemp', "Force use of hddtemp for disk temps." ],
 	['1', '', '--host', "Turn on hostname for -S." ],
 	['1', '', '--html-wan', "Overrides configuration item NO_HTML_WAN (resets to default)." ],
 	['1', '', '--limit', "[-1; 1-x] Set max output limit of IP addresses for -i 
 	(default 10; -1 removes limit)." ],
 	);
-	if ( $use{'update'} ){
+	if ($use{'update'}){
 		push(@data, 
 		['1', '', '--man', "Install correct man version for dev branch (-U 3) or pinxi using -U." ],
 		);
 	}
 	push(@data, 
 	['1', '', '--no-dig', "Skip dig for WAN IP checks, use downloader program." ],
+	['1', '', '--no-doas', "Skip internal program use of doas features (not related 
+	to starting $self_name with doas)." ],
 	['1', '', '--no-host', "Turn off hostname for -S. Useful if showing output from servers etc. 
 	-z triggers --no-host." ],
 	['1', '', '--no-html-wan', "Skip HTML IP sources for WAN IP checks, use dig only, 
 	or nothing if --no-dig." ],
 	);
-	if ( $use{'update'} ){
+	if ($use{'update'}){
 		push(@data, 
 		['1', '', '--no-man', "Disable man install for all -U update actions." ],
 		);
@@ -5248,6 +5615,8 @@ sub show_options {
 	['1', '', '--output-file', "[Full filepath|print] Output file to be used for --output." ],
 	['1', '', '--partition-sort', "[dev-base|fs|id|label|percent-used|size|uuid|used] 
 	Change sort order of ${partition_string} output. See man page for specifics." ],
+	['1', '', '--pkg', "Force use of disabled package manager counts for packages feature. 
+	RPM disabled by default due to possible massive rpm package query times." ],
 	['1', '', '--sensors-default', "Removes configuration item SENSORS_USE and SENSORS_EXCLUDE.
 	Same as default behavior." ],
 	['1', '', '--sensors-exclude', "[sensor[s] name, comma separated] Exclude supplied sensor 
@@ -5261,8 +5630,9 @@ sub show_options {
 	inside of another tool like Chef or MOTD and returns corrupted color codes. Please see
 	man page or file an issue if you need to use this flag. Must use -y [width] option if 
 	you want a specific output width. Always put this option first in an option list."],
-	['1', '', '--usb-sys', "Force USB data to use /sys as data source (Linux only)." ],
-	['1', '', '--usb-tool', "Force USB data to use lsusb as data source (Linux only)." ],
+	['1', '', '--usb-sys', "Force USB data to use only /sys as data source (Linux only)." ],
+	['1', '', '--usb-tool', "Force USB data to use lsusb as data source [default]
+	(Linux only)." ],
 	['1', '', '--wan-ip-url', "[URL] Skips dig, uses supplied URL for WAN IP (-i). 
 	URL output must end in the IP address. See man. 
 	Example:^$self_name^-i^--wan-ip-url^https://yoursite.com/ip.php" ],
@@ -5288,12 +5658,12 @@ sub show_options {
 	['2', '22', '', "Upload debugger dataset to $self_name debugger server 
 	automatically, removes debugger data directory and debugger tar.gz file." ],
 	# ['1', '', '--debug-filter', "Add -z flag to debugger $self_name optiions." ],
-	['1', '', '--debug-proc', "Force debugger parsing of /proc as sudo/root." ],
+	['1', '', '--debug-proc', "Force debugger parsing of /proc as sudo/doas/root." ],
 	['1', '', '--debug-proc-print', "To locate file that /proc debugger hangs on." ],
 	['1', '', '--debug-no-exit', "Skip exit on error to allow completion." ],
 	['1', '', '--debug-no-proc', "Skip /proc debugging in case of a hang." ],
 	['1', '', '--debug-no-sys', "Skip /sys debugging in case of a hang." ],
-	['1', '', '--debug-sys', "Force PowerPC debugger parsing of /sys as sudo/root." ],
+	['1', '', '--debug-sys', "Force PowerPC debugger parsing of /sys as sudo/doas/root." ],
 	['1', '', '--debug-sys-print', "To locate file that /sys debugger hangs on." ],
 	['1', '', '--ftp', "Use with --debugger 21 to trigger an alternate FTP server for upload. 
 	Format:^[ftp.xx.xx/yy]. Must include a remote directory to upload to. 
@@ -5309,17 +5679,17 @@ sub show_version {
 	my $working_path=$self_path;
 	my (@data,$link,$self_string);
 	Cwd->import('getcwd'); # no point loading this on top use, we only use getcwd here
-	if ( $working_path eq '.' ){
+	if ($working_path eq '.'){
 		$working_path = getcwd();
 	}
-	elsif ( $working_path !~ /^\// ){
+	elsif ($working_path !~ /^\//){
 		$working_path = getcwd() . "/$working_path";
 	}
 	$working_path =~ s%/$%%;
 	# handle if it's a symbolic link, rare, but can happen with directories 
 	# in irc clients which would only matter if user starts inxi with -! 30 override 
 	# in irc client
-	if ( -l "$working_path/$self_name" ){
+	if (-l "$working_path/$self_name"){
 		$link="$working_path/$self_name";
 		$working_path = readlink "$working_path/$self_name";
 		$working_path =~ s/[^\/]+$//;
@@ -5327,7 +5697,7 @@ sub show_version {
 	# strange output /./ ending, but just trim it off, I don't know how it happens
 	$working_path =~ s%/\./%/%;
 	push(@data, [ 0, '', '', "$self_name $self_version-$self_patch ($self_date)"]);
-	if ( ! $b_irc ){
+	if (!$b_irc){
 		push(@data, [ 0, '', '', '']);
 		my $year = (split/-/, $self_date)[0];
 		push(@data, 
@@ -5336,7 +5706,7 @@ sub show_version {
 		[ 0, '', '', "Using Perl version: $]"],
 		[ 0, '', '', "Program Location: $working_path" ],
 		);
-		if ( $link ){
+		if ($link){
 			push(@data, [ 0, '', '', "Started via symbolic link: $link" ]);
 		}
 		push(@data, 
@@ -5359,15 +5729,14 @@ sub show_version {
 #### STARTUP DATA
 ########################################################################
 
-# StartClient
+## StartClient
 {
 package StartClient;
 # use warnings;
 # use strict;
-my $ppid = '';
 my $pppid = '';
 
-# NOTE: there's no reason to crete an object, we can just access
+# NOTE: there's no reason to create an object, we can just access
 # the features statically. 
 # args: none
 # sub new {
@@ -5377,14 +5746,11 @@ my $pppid = '';
 # 	# print "$type\n";
 # 	return bless $self, $class;
 # }
-
-sub get_client_data {
+sub set {
 	eval $start if $b_log;
-	$ppid = getppid();
-	main::set_ps_aux() if ! @ps_aux;
+	main::set_ps_aux() if !$loaded{'ps-aux'};
 	if (!$b_irc){
 		# we'll run get_shell_data for -I, but only then
-		$client{'ppid'} = $ppid;
 	}
 	else {
 		$use{'filter'} = 1; 
@@ -5399,17 +5765,16 @@ sub get_client_data {
 sub get_client_name {
 	eval $start if $b_log;
 	my $client_name = '';
-	
 	# print "$ppid\n";
-	if ($ppid && -e "/proc/$ppid/exe" ){
+	if ($ppid && -e "/proc/$ppid/exe"){
 		$client_name = lc(readlink "/proc/$ppid/exe");
 		$client_name =~ s/^.*\///;
-		if ($client_name =~ /^bash|dash|sh|python.*|perl.*$/){
-			$pppid = (main::grabber("ps -p $ppid -o ppid"))[1];
-			#my @temp = (main::grabber("ps -p $ppid -o ppid 2>/dev/null"))[1];
+		if ($client_name =~ /^(bash|csh|dash|fish|sh|python.*|perl.*|zsh)$/){
+			$pppid = (main::grabber("ps -wwp $ppid -o ppid"))[1];
+			# my @temp = (main::grabber("ps -wwp $ppid -o ppid 2>/dev/null"))[1];
 			$pppid =~ s/^\s+|\s+$//g;
 			$client_name =~ s/[0-9\.]+$//; # clean things like python2.7
-			if ($pppid && -f "/proc/$pppid/exe" ){
+			if ($pppid && -f "/proc/$pppid/exe"){
 				$client_name = lc(readlink "/proc/$pppid/exe");
 				$client_name =~ s/^.*\///;
 				$client{'native'} = 0;
@@ -5418,16 +5783,15 @@ sub get_client_name {
 		$client{'name'} = $client_name;
 		get_client_version();
 		# print "c:$client_name p:$pppid\n";
-		#print "$client{'name-print'}\n";
+		# print "$client{'name-print'}\n";
 	}
 	else {
-		if (! check_modern_konvi() ){
-			$ppid = getppid();
-			$client_name = (main::grabber("ps -p $ppid"))[1];
+		if (!check_modern_konvi()){
+			$client_name = (main::grabber("ps -wwp $ppid 2>/dev/null"))[1];
 			if ($client_name){
-				my @data = split(/\s+/, $client_name) if $client_name;
+				my @data = split(/\s+/, $client_name);
 				if ($bsd_type){
-					$client_name = lc($data[5]);
+					$client_name = lc($data[4]);
 				}
 				# gnu/linux uses last value
 				else {
@@ -5460,11 +5824,11 @@ sub get_client_version {
 		$client{'name-print'} = $app[3];
 		$client{'console-irc'} = $app[4];
 	}
-	if ($client{'name'} =~ /^bash|dash|sh$/ ){
+	if ($client{'name'} =~ /^(bash|csh|fish|dash|sh|zsh)$/){
 		$client{'name-print'} = 'shell wrapper';
 		$client{'console-irc'} = 1;
 	}
-	elsif ($client{'name'} eq 'bitchx') {
+	elsif ($client{'name'} eq 'bitchx'){
 		@data = main::grabber("$client{'name'} -v");
 		$string = awk(\@data,'Version');
 		if ($string){
@@ -5479,28 +5843,28 @@ sub get_client_version {
 	# so we need to read the actual config file for hexchat. Note that older hexchats
 	# used xchat config file, so test first for default, then legacy. Because it's possible
 	# for this file to be user edited, doing some extra checks here.
-	elsif ($client{'name'} eq 'hexchat') {
-		if ( -f '~/.config/hexchat/hexchat.conf' ){
+	elsif ($client{'name'} eq 'hexchat'){
+		if (-f '~/.config/hexchat/hexchat.conf'){
 			@data = main::reader('~/.config/hexchat/hexchat.conf','strip');
 		}
-		elsif ( -f '~/.config/hexchat/xchat.conf' ){
+		elsif (-f '~/.config/hexchat/xchat.conf'){
 			@data = main::reader('~/.config/hexchat/xchat.conf','strip');
 		}
 		if (@data){
 			$client{'version'} = main::awk(\@data,'version',2,'\s*=\s*');
 		}
 		# fingers crossed, hexchat won't open gui!!
-		if (!$client{'version'}) {
+		if (!$client{'version'}){
 			@data = main::grabber("$client{'name'} --version 2>/dev/null");
 			$client{'version'} = main::awk(\@data,'hexchat',2,'\s+');
 		}
 		$client{'name-print'} = 'HexChat';
 	}
 	# note: see legacy inxi konvi logic if we need to restore any of the legacy code.
-	elsif ($client{'name'} eq 'konversation') {
-		$client{'konvi'} = ( ! $client{'native'} ) ? 2 : 1;
+	elsif ($client{'name'} eq 'konversation'){
+		$client{'konvi'} = (!$client{'native'}) ? 2 : 1;
 	}
-	elsif ($client{'name'} =~ /quassel/) {
+	elsif ($client{'name'} =~ /quassel/i){
 		@data = main::grabber("$client{'name'} -v 2>/dev/null");
 		foreach (@data){
 			if ($_ =~ /^Quassel IRC:/){
@@ -5515,7 +5879,7 @@ sub get_client_version {
 		$client{'version'} ||= '(pre v0.4.1)?'; 
 	}
 	# then do some perl type searches, do this last since it's a wildcard search
-	elsif ($client{'name'} =~ /^(perl.*|ksirc|dsirc)$/ ) {
+	elsif ($client{'name'} =~ /^(perl.*|ksirc|dsirc)$/){
 		my @cmdline = main::get_cmdline();
 		# Dynamic runpath detection is too complex with KSirc, because KSirc is started from
 		# kdeinit. /proc/<pid of the grandparent of this process>/exe is a link to /usr/bin/kdeinit
@@ -5526,7 +5890,7 @@ sub get_client_version {
 		# KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
 		# (KSirc sucks anyway ;)
 		foreach (@cmdline){
-			if ( $_ =~ /dsirc/ ){
+			if ($_ =~ /dsirc/){
 				$client{'version'} = main::program_version('ksirc','KSirc:',2,'-v',0,0);
 				$client{'name'} = 'ksirc';
 				$client{'name-print'} = 'KSirc';
@@ -5535,21 +5899,23 @@ sub get_client_version {
 		$client{'console-irc'} = 1;
 		perl_python_client();
 	}
-	elsif ($client{'name'} =~ /python/) {
+	elsif ($client{'name'} =~ /python/){
 		perl_python_client();
 	}
-	if (!$client{'name-print'}) {
-		# NOTE: these must be empirically determined, not all events that 
-		# show no tty are actually IRC.
-		my $wl_terms = 'alacritty|evilvte|germinal|guake|hyper|kate|kitty|kmscon|';
-		$wl_terms .= 'konsole|minicom|putty|rxvt|sakura|shellinabox|^st$|sudo|term|tilda|';
-		$wl_terms .= 'tilix|urvxt|yaft|yakuake';
+	# NOTE: these must be empirically determined, not all events that 
+	# show no tty are actually IRC. tmux is not a vt, but runs inside one
+	if (!$client{'name-print'}){
+		my $wl_terms = 'alacritty|altyo|black-screen|conhost|doas|evilvte|';
+		$wl_terms .= 'germinal|guake|havoc|hyper|kate|kitty|kmscon|konsole|login|';
+		$wl_terms .= 'macwise|minicom|putty|rxvt|sakura|securecrt|shellinabox|';
+		$wl_terms .= '^st$|sudo|term|tilda|tilix|tmux|tym|wayst|xiki|';
+		$wl_terms .= 'yaft|yakuake|\bzoc\b';
 		my $wl_clients = 'ansible|chef|run-parts|sshd';
 		my $whitelist = "$wl_terms|$wl_clients";
 		# print "$client{'name'}\n";
 		if ($client{'name'} =~ /($whitelist)/i){
 			if ($client{'name'} =~ /($wl_terms)/i){
-				main::get_shell_data($ppid);
+				ShellData::set();
 			}
 			else {
 				$client{'name-print'} = $client{'name'};
@@ -5566,12 +5932,11 @@ sub get_cmdline {
 	eval $start if $b_log;
 	my @cmdline;
 	my $i = 0;
-	$ppid = getppid();
-	if (! -e "/proc/$ppid/cmdline" ){
+	if (! -e "/proc/$ppid/cmdline"){
 		return 1;
 	}
 	local $\ = '';
-	open( my $fh, '<', "/proc/$ppid/cmdline" ) or 
+	open(my $fh, '<', "/proc/$ppid/cmdline") or 
 	  print_line("Open /proc/$ppid/cmdline failed: $!");
 	my @rows = <$fh>;
 	close $fh;
@@ -5580,7 +5945,7 @@ sub get_cmdline {
 		$i++;
 		last if $i > 31;
 	}
-	if ( $i == 0 ){
+	if ($i == 0){
 		$cmdline[0] = $rows[0];
 		$i = ($cmdline[0]) ? 1 : 0;
 	}
@@ -5594,8 +5959,8 @@ sub perl_python_client {
 	# this is a hack to try to show konversation if inxi is running but started via /cmd
 	# OR via program shortcuts, both cases in fact now
 	# main::print_line("konvi: " . scalar grep { $_ =~ /konversation/ } @ps_cmd);
-	if ( $b_display && main::check_program('konversation') && 
-	 ( grep { $_ =~ /konversation/ } @ps_cmd )){
+	if ($b_display && main::check_program('konversation') && 
+	 (grep { $_ =~ /konversation/ } @ps_cmd)){
 		@app = main::program_values('konversation');
 		$client{'version'} = main::program_version('konversation',$app[0],$app[1],$app[2],$app[5],$app[6]);
 		$client{'name'} = 'konversation';
@@ -5604,18 +5969,18 @@ sub perl_python_client {
 	}
 	## NOTE: supybot only appears in ps aux using 'SHELL' command; the 'CALL' command
 	## gives the user system irc priority, and you don't see supybot listed, so use SHELL
-	elsif ( !$b_display && 
+	elsif (!$b_display && 
 	 (main::check_program('supybot') || 
 	 main::check_program('gribble') || main::check_program('limnoria')) &&
-	 ( grep { $_ =~ /supybot/ } @ps_cmd ) ){
+	 (grep { $_ =~ /supybot/ } @ps_cmd)){
 		@app = main::program_values('supybot');
 		$client{'version'} = main::program_version('supybot',$app[0],$app[1],$app[2],$app[5],$app[6]);
 		if ($client{'version'}){
-			if ( grep { $_ =~ /gribble/ } @ps_cmd ){
+			if (grep { $_ =~ /gribble/ } @ps_cmd){
 				$client{'name'} = 'gribble';
 				$client{'name-print'} = 'Gribble';
 			}
-			if ( grep { $_ =~ /limnoria/ } @ps_cmd){
+			if (grep { $_ =~ /limnoria/ } @ps_cmd){
 				$client{'name'} = 'limnoria';
 				$client{'name-print'} = 'Limnoria';
 			}
@@ -5644,7 +6009,7 @@ sub perl_python_client {
 ## and all other irc clients are not running. As of 2014-03-25 this isn't used in my cases
 sub check_modern_konvi {
 	eval $start if $b_log;
-	return 0 if ! $client{'qdbus'};
+	return 0 if !$client{'qdbus'};
 	my $b_modern_konvi = 0;
 	my $konvi_version = '';
 	my $konvi = '';
@@ -5652,7 +6017,7 @@ sub check_modern_konvi {
 	my (@temp);
 	# main::log_data('data',"name: $client{'name'} :: qdb: $client{'qdbus'} :: version: $client{'version'} :: konvi: $client{'konvi'} :: PPID: $ppid") if $b_log;
 	# sabayon uses /usr/share/apps/konversation as path
-	if ( -d '/usr/share/kde4/apps/konversation' || -d '/usr/share/apps/konversation' ){
+	if (-d '/usr/share/kde4/apps/konversation' || -d '/usr/share/apps/konversation'){
 		$pid = main::awk(\@ps_aux,'konversation -session',2,'\s+');
 		main::log_data('data',"pid: $pid") if $b_log;
 		$konvi = readlink ("/proc/$pid/exe");
@@ -5680,7 +6045,7 @@ sub check_modern_konvi {
 	## for testing this module
 # 	my $ppid = getppid();
 # 	system('qdbus org.kde.konversation', '/irc', 'say', $client{'dserver'}, $client{'dtarget'}, 
-# 	"getpid_dir: $konvi_qt4 verNum: $konvi_version pid: $pid ppid: $ppid" );
+# 	"getpid_dir: $konvi_qt4 verNum: $konvi_version pid: $pid ppid: $ppid");
 	eval $end if $b_log;
 	return $b_modern_konvi;
 }
@@ -5689,12 +6054,12 @@ sub set_konvi_data {
 	eval $start if $b_log;
 	my $config_tool = '';
 	# https://userbase.kde.org/Konversation/Scripts/Scripting_guide
-	if ( $client{'konvi'} == 3 ){
+	if ($client{'konvi'} == 3){
 		$client{'dserver'} = shift @ARGV;
 		$client{'dtarget'} = shift @ARGV;
 		$client{'dobject'} = 'default';
 	}
-	elsif ( $client{'konvi'} == 1 ){
+	elsif ($client{'konvi'} == 1){
 		$client{'dport'} = shift @ARGV;
 		$client{'dserver'} = shift @ARGV;
 		$client{'dtarget'} = shift @ARGV;
@@ -5703,20 +6068,20 @@ sub set_konvi_data {
 	# for some reason this logic hiccups on multiple spaces between args
 	@ARGV = grep { $_ ne '' } @ARGV;
 	# there's no current kde 5 konvi config tool that we're aware of. Correct if changes.
-	if ( main::check_program('kde4-config') ){
+	if (main::check_program('kde4-config')){
 		$config_tool = 'kde4-config';
 	}
-	elsif ( main::check_program('kde5-config') ){
+	elsif (main::check_program('kde5-config')){
 		$config_tool = 'kde5-config';
 	}
-	elsif ( main::check_program('kde-config') ){
+	elsif (main::check_program('kde-config')){
 		$config_tool = 'kde-config';
 	}
 	# The section below is on request of Argonel from the Konversation developer team:
 	# it sources config files like $HOME/.kde/share/apps/konversation/scripts/inxi.conf
 	if ($config_tool){
 		my @data = main::grabber("$config_tool --path data 2>/dev/null",':');
-		main::get_configs(\@data);
+		Configs::set(\@data);
 	}
 	eval $end if $b_log;
 }
@@ -5733,18 +6098,19 @@ sub set_konvi_data {
 sub apply_filter {
 	my ($string) = @_;
 	if ($string){
-		$string = ( $use{'filter'} ) ? $filter_string : $string;
+		$string = ($use{'filter'}) ? $filter_string : $string;
 	}
 	else {
 		$string = 'N/A';
 	}
 	return $string;
 }
+
 # note, let the print logic handle N/A cases
 sub apply_partition_filter {
 	my ($source,$string,$type) = @_;
 	return $string if !$string || $string eq 'N/A';
-	if ($source eq 'system') {
+	if ($source eq 'system'){
 		my $test = ($type eq 'label') ? '=LABEL=': '=UUID=';
 		$string =~ s/$test[^\s]+/$test$filter_string/g;
 	}
@@ -5753,6 +6119,7 @@ sub apply_partition_filter {
 	}
 	return $string;
 }
+
 sub arm_cleaner {
 	my ($item) = @_;
 	$item =~ s/(\([^\(]*Device Tree[^\)]*\))//gi;
@@ -5766,7 +6133,7 @@ sub clean_characters {
 	# newline, pipe, brackets, + sign, with space, then clear doubled
 	# spaces and then strip out trailing/leading spaces.
 	# etc/issue often has junk stuff like (\l)  \n \l
-	return if ! $data;
+	return if !$data;
 	$data =~ s/[:\47]|\\[a-z]|\n|,|\"|\*|\||\+|\[\s\]|n\/a|\s\s+/ /g; 
 	$data =~ s/\(\s*\)//;
 	$data =~ s/^\s+|\s+$//g;
@@ -5777,7 +6144,7 @@ sub cleaner {
 	my ($item) = @_;
 	return $item if !$item;# handle cases where it was 0 or ''
 	# note: |nee trips engineering, but I don't know why nee was filtered
-	$item =~ s/chipset|company|components|computing|computer|corporation|communications|electronics|electrical|electric|gmbh|group|incorporation|industrial|international|\bnee\b|revision|semiconductor|software|technologies|technology|ltd\.|<ltd>|\bltd\b|inc\.|<inc>|\binc\b|intl\.|co\.|<co>|corp\.|<corp>|\(tm\)|\(r\)|®|\(rev ..\)|\'|\"|\sinc\s*$|\?//gi;
+	$item =~ s/chipset|company|components|computing|computer|corporation|communications|electronics|electrical|electric|gmbh|group|incorporation|industrial|international|\bnee\b|no\sstring|revision|semiconductor|software|technologies|technology|ltd\.|<ltd>|\bltd\b|inc\.|<inc>|\binc\b|intl\.|co\.|<co>|corp\.|<corp>|\(tm\)|\(r\)|®|\(rev ..\)|\'|\"|\sinc\s*$|\?//gi;
 	$item =~ s/,|\*/ /g;
 	$item =~ s/\s\s+/ /g;
 	$item =~ s/^\s+|\s+$//g;
@@ -5815,6 +6182,7 @@ sub general_cleaner {
 	$string =~ s/$cleaner//i;
 	return $string;
 }
+
 # args: $1 - size in KB, return KB, MB, GB, TB, PB, EB; $2 - 'string';
 # $3 - default value if null
 # returns string with units or array or size unmodified if not numeric
@@ -5867,7 +6235,7 @@ sub get_size {
 sub increment_starters {
 	my ($key,$indexes) = @_;
 	my $result = $key;
-	if (defined $indexes->{$key} ){
+	if (defined $indexes->{$key}){
 		$indexes->{$key}++;
 		$result = "$key-$indexes->{$key}";
 	}
@@ -5876,7 +6244,7 @@ sub increment_starters {
 
 sub pci_cleaner {
 	my ($string,$type) = @_;
-	#print "st1 $type:$string\n";
+	# print "st1 $type:$string\n";
 	my $filter = 'and\ssubsidiaries|compatible\scontroller|';
 	$filter .= '\b(device|controller|connection|multimedia)\b|\([^)]+\)';
 	# \[[^\]]+\]$| not trimming off ending [...] initial type filters removes end
@@ -5884,10 +6252,11 @@ sub pci_cleaner {
 	$string =~ s/($filter)//ig;
 	$string =~ s/\s\s+/ /g;
 	$string =~ s/^\s+|\s+$//g;
-	#print "st2 $type:$string\n";
+	# print "st2 $type:$string\n";
 	$string = remove_duplicates($string) if $string;
 	return $string;
 }
+
 sub pci_cleaner_subsystem {
 	my ($string) = @_;
 	# we only need filters for features that might use vendor, -AGN
@@ -5914,7 +6283,7 @@ sub pci_long_filter {
 # which can contain regex characters, get rid of those
 sub regex_cleaner {
 	my ($string) = @_;
-	return if ! $string;
+	return if !$string;
 	$string =~ s/(\{|\}|\(|\)|\[|\]|\|)/ /g;
 	$string =~ s/\s\s+/ /g;
 	$string =~ s/^\s+|\s+$//g;
@@ -5923,7 +6292,7 @@ sub regex_cleaner {
 
 sub remove_duplicates {
 	my ($string) = @_;
-	return if ! $string;
+	return if !$string;
 	my $holder = '';
 	my (@temp);
 	foreach (split(/\s+/, $string)){
@@ -5942,15 +6311,17 @@ sub row_defaults {
 	my %unfound = (
 	'arm-cpu-f' => 'Use -f option to see features',
 	'arm-pci' => 'No ARM data found for this feature.',
-	'battery-data' => 'No system Battery data found. Is one present?',
+	'battery-data' => 'No system battery data found. Is one present?',
+	'battery-data-bsd' => 'No battery data found. Try with --dmidecode',
 	'battery-data-sys' => 'No /sys data found.',
-	'bluetooth-data' => 'No Bluetooth data was found.',
+	'bluetooth-data' => 'No bluetooth data found.',
+	'bluetooth-down' => "tool can't run",
 	'cpu-bugs-null' => 'No CPU vulnerability/bugs data available.',
 	'cpu-model-null' => 'Model N/A',
-	'cpu-speeds' => "No speed data found for $id cores.",
+	'cpu-speeds' => 'No per core speed data found.',
 	'darwin-feature' => 'Feature not supported iu Darwin/OSX.',
-	'disk-data' => 'No Disk data was found.',
-	'disk-data-bsd' => 'No Disk data found for this BSD system.',
+	'disk-data' => 'No disk data found.',
+	'disk-data-bsd' => 'No disk data found.',
 	'disk-size-0' => 'Total N/A',
 	'display-console' => 'No advanced graphics data found on this system in console.',
 	'display-driver-na' => 'n/a (using device driver)',
@@ -5969,38 +6340,49 @@ sub row_defaults {
 	'dmidecode-smbios' => 'No SMBIOS data for dmidecode to process',
 	'IP-dig' => "No $id found. Connected to web? SSL issues? Try --no-dig",
 	'IP-no-dig' => "No $id found. Connected to web? SSL issues? Try enabling dig",
-	'lvm-data' => 'No LVM data was found.',
-	'lvm-data-bsd' => 'No BSD support for LVM data.',
-	'machine-data' => 'No Machine data: try newer kernel.',
-	'machine-data-bsd' => 'No Machine data: Is dmidecode installed? Try -M --dmidecode.',
-	'machine-data-dmidecode' => 'No Machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
-	'machine-data-force-dmidecode' => 'No Machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
+	'logical-data' => 'No logical block device data found.',
+	'logical-data-bsd' => "Logical block device feature unsupported in $id.",
+	'machine-data' => 'No machine data: try newer kernel.',
+	'machine-data-bsd' => 'No machine data: Is dmidecode installed? Try -M --dmidecode.',
+	'machine-data-dmidecode' => 'No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
+	'machine-data-force-dmidecode' => 'No machine data: try newer kernel. Is dmidecode installed? Try -M --dmidecode.',
 	'mips-pci' => 'No MIPS data found for this feature.',
 	'note-check' => 'check',
 	'note-est' => 'est.',
-	'optical-data' => 'No Optical or Floppy data was found.',
-	'optical-data-bsd' => 'No Optical or Floppy data found for this BSD system.',
+	'optical-data' => 'No optical or floppy data found.',
+	'optical-data-bsd' => 'No optical or floppy data found.',
 	'output-limit' => "Output throttled. IPs: $id; Limit: $limit; Override: --limit [1-x;-1 all]",
-	'packages' => 'No packages detected. Unsupported package manager?',
-	'partition-data' => 'No Partition data was found.',
+	'package-data' => 'No packages detected. Unsupported package manager?',
+	'partition-data' => 'No partition data found.',
 	'partition-hidden' => 'N/A (hidden?)',
 	'pci-advanced-data' => 'bus/chip ids unavailable',
-	'pci-card-data' => 'No Device data found.',
+	'pci-card-data' => 'No device data found.',
 	'pci-card-data-root' => 'Device data requires root.',
 	'pci-slot-data' => 'No PCI Slot data found.',
-	'ps-data-null' => 'No Process data available.',
-	'raid-data' => 'No RAID data was found.',
-	'ram-data' => 'No RAM data was found.',
+	'pm-disabled' => 'see --pkg',
+	'ps-data-null' => 'No process data available.',
+	'raid-data' => 'No RAID data found.',
+	'ram-data' => 'No RAM data found.',
+	'ram-data-complete' => 'For complete report, try with --dmidecode',
+	'ram-data-dmidecode' => 'No RAM data found. Try with --dmidecode',
+	'recommends' => 'see --recommends',
+	'repo-data', "No repo data detected. Does $self_name support your package manager?",
+	'repo-data-bsd', "No repo data detected. Does $self_name support $id?",
+	'root-feature' => 'Feature requires superuser permissions.',
+	'root-item-incomplete' => "Full $id report requires superuser permissions.",
 	'root-required' => '<superuser required>',
-	'root-suggested' => 'try sudo/root',
-	'sensors-data-ipmi' => 'No ipmi sensors data was found.',
-	'sensors-data-linux' => 'No sensors data was found. Is sensors configured?',
+	'root-suggested' => 'try sudo/root',# gdm only
+	'sensors-data-bsd' => "$id sensor data found but not usable.",
+	'sensors-data-bsd-ok' => 'No sensor data found. Are sensors present?',
+	'sensors-data-ipmi' => 'No ipmi sensor data found.',
+	'sensors-data-linux' => 'No sensor data found. Is lm-sensors configured?',
 	'sensors-ipmi-root' => 'Unable to run ipmi sensors. Root privileges required.',
-	'smartctl-command-failed' => 'A mandatory SMART command failed. Various possible causes.',
+	'smartctl-command' => 'A mandatory SMART command failed. Various possible causes.',
+	'smartctl-open' => 'Unable to open device. Wrong device ID given?',
 	'smartctl-udma-crc' => 'Bad cable/connection?',
 	'smartctl-usb' => 'Unknown USB bridge. Flash drive/Unsupported enclosure?',
-	'swap-admin' => 'No admin Swap data available.',
-	'swap-data' => 'No Swap data was found.',
+	'swap-admin' => 'No admin swap data available.',
+	'swap-data' => 'No swap data was found.',
 	'tool-missing-basic' => "<missing: $id>",
 	'tool-missing-incomplete' => "Missing system tool: $id. Output will be incomplete",
 	'tool-missing-os' => "No OS support. Is a comparable $id tool available?",
@@ -6009,10 +6391,12 @@ sub row_defaults {
 	'tool-permissions' => "Unable to run $id. Root privileges required.",
 	'tool-present' => 'Present and working',
 	'tool-unknown-error' => "Unknown $id error. Unable to generate data.",
-	'unmounted-data' => 'No Unmounted partitions found.',
-	'unmounted-data-bsd' => 'No Unmounted partition data found for this BSD system.',
+	'tools-missing' => "This feature requires one of these tools: $id",
+	'tools-missing-bsd' => "This feature requires one of these tools: $id",
+	'unmounted-data' => 'No unmounted partitions found.',
+	'unmounted-data-bsd' => "Unmounted partition feature unsupported in $id.",
 	'unmounted-file' => 'No /proc/partitions file found.',
-	'usb-data' => 'No USB data was found. Server?',
+	'usb-data' => 'No USB data found. Server?',
 	'unknown-desktop-version' => 'ERR-101',
 	'unknown-dev' => 'ERR-102',
 	'unknown-shell' => 'ERR-100',
@@ -6023,31 +6407,37 @@ sub row_defaults {
 }
 
 # convert string passed to KB, based on GB/MB/TB id
-# NOTE: K 1024 KB 1000
+# NOTE: K 1024 KB 1000 KiB 1024
+# The logic will turn false MB to M for this tool
+# Hopefully one day sizes will all be in KiB type units
 sub translate_size {
 	my ($working) = @_;
-	my $size = 0;
-	#print ":$working:\n";
+	my ($size,$unit) = (0,'');
+	# print ":$working:\n";
 	return if ! defined $working;
-	my $math = ( $working =~ /B$/) ? 1000: 1024;
-	if ( $working =~ /^([0-9\.]+)\s*M[B]?$/i){
+	my $math = ($working =~ /B$/) ? 1000: 1024;
+	if ($working =~ /^([0-9\.]+)\s*([kKMGTPE])i?B?$/i){
+		$size = $1;
+		$unit = uc($2);
+	}
+	if ($unit eq 'K'){
+		$size = $1;
+	}
+	elsif ($unit eq 'M'){
 		$size = $1 * $math;
 	}
-	elsif ( $working =~ /^([0-9\.]+)\s*G[B]?$/i){
+	elsif ($unit eq 'G'){
 		$size = $1 * $math**2;
 	}
-	elsif ( $working =~ /^([0-9\.]+)\s*T[B]?$/i){
+	elsif ($unit eq 'T'){
 		$size = $1 * $math**3;
 	}
-	elsif ( $working =~ /^([0-9\.]+)\s*P[B]?$/i){
+	elsif ($unit eq 'P'){
 		$size = $1 * $math**4;
 	}
-	elsif ( $working =~ /^([0-9\.]+)\s*E[B]?$/i){
+	elsif ($unit eq 'E'){
 		$size = $1 * $math**5;
 	}
-	elsif ( $working =~ /^([0-9\.]+)\s*[kK][B]?$/i){
-		$size = $1;
-	}
 	$size = int($size) if $size;
 	return $size;
 }
@@ -6066,6 +6456,7 @@ sub check_output_path {
 	$b_good = 1 if (-d $dir && -w $dir && $dir =~ /^\// && $file);
 	return $b_good;
 }
+
 # passing along hash ref
 sub output_handler {
 	my ($data) = @_;
@@ -6080,6 +6471,7 @@ sub output_handler {
 		generate_xml($data);
 	}
 }
+
 # passing along hash ref
 # NOTE: file has already been set and directory verified
 sub generate_json {
@@ -6127,7 +6519,7 @@ sub generate_xml {
 	my ($xml);
 	my $b_debug = 0;
 	error_handler('not-in-irc', 'help') if $b_irc;
-	#print Dumper $data if $b_debug;
+	# print Dumper $data if $b_debug;
 	if (check_perl_module('XML::Dumper')){
 		XML::Dumper->import;
 		$xml = XML::Dumper::pl2xml($data);
@@ -6164,28 +6556,28 @@ sub print_basic {
 	my $length =  @$data;
 	my ($start,$i,$j,$line);
 	
-	if ( $size{'max'} > 110 ){
+	if ($size{'max'} > 110){
 		$indent_static = 22;
 	}
-	elsif ($size{'max'} < 90 ){
+	elsif ($size{'max'} < 90){
 		$indent_static = 15;
 	}
 	# print $length . "\n";
 	for my $i (0 .. $#$data){
-		#print "0: $data->[$i][0]\n";
-		if ($data->[$i][0] == 0 ){
+		# print "0: $data->[$i][0]\n";
+		if ($data->[$i][0] == 0){
 			$indent = 0;
 			$indent1 = 0;
 			$indent2 = 0;
 		}
-		elsif ($data->[$i][0] == 1 ){
+		elsif ($data->[$i][0] == 1){
 			$indent = $indent_static;
 			$indent1 = $indent1_static;
 			$indent2= $indent2_static;
 		}
-		elsif ($data->[$i][0] == 2 ){
-			$indent = ( $indent_static + 7 );
-			$indent1 = ( $indent_static + 5 );
+		elsif ($data->[$i][0] == 2){
+			$indent = ($indent_static + 7);
+			$indent1 = ($indent_static + 5);
 			$indent2 = 0;
 		}
 		$data->[$i][3] =~ s/\n/ /g;
@@ -6194,17 +6586,17 @@ sub print_basic {
 			$data->[$i][1] = $data->[$i][1] . ', ';
 		}
 		$start = sprintf("%${indent1}s%-${indent2}s",$data->[$i][1],$data->[$i][2]);
-		if ($indent > 1 && ( length($start) > ( $indent - 1) ) ){
+		if ($indent > 1 && (length($start) > ($indent - 1))){
 			$line = sprintf("%-${indent}s\n", "$start");
 			print_line($line);
 			$start = '';
-			#print "1-print.\n";
+			# print "1-print.\n";
 		}
-		if ( ( $indent + length($data->[$i][3]) ) < $size{'max'} ){
+		if (($indent + length($data->[$i][3])) < $size{'max'}){
 			$data->[$i][3] =~ s/\^/ /g;
 			$line = sprintf("%-${indent}s%s\n", "$start", $data->[$i][3]);
 			print_line($line);
-			#print "2-print.\n";
+			# print "2-print.\n";
 		}
 		else {
 			my $holder = '';
@@ -6212,26 +6604,26 @@ sub print_basic {
 			# note: special case, split ' ' trims leading, trailing spaces, 
 			# then splits like awk, on one or more white spaces.
 			foreach my $word (split(' ', $data->[$i][3])){
-				#print "$word\n";
-				if ( ( $indent + length($holder) + length($word) ) < $size{'max'} ) {
+				# print "$word\n";
+				if (($indent + length($holder) + length($word)) < $size{'max'}){
 					$word =~ s/\^/ /g;
 					$holder .= $word . $sep;
-					#print "3-hold.\n";
+					# print "3-hold.\n";
 				}
-				#elsif ( ( $indent + length($holder) + length($word) ) >= $size{'max'}){
+				# elsif (($indent + length($holder) + length($word)) >= $size{'max'}){
 				else {
 					$line = sprintf("%-${indent}s%s\n", "$start", $holder);
 					print_line($line);
 					$start = '';
 					$word =~ s/\^/ /g;
 					$holder = $word . $sep;
-					#print "4-print-hold.\n";
+					# print "4-print-hold.\n";
 				}
 			}
 			if ($holder !~ /^[ ]*$/){
 				$line = sprintf("%-${indent}s%s\n", "$start", $holder);
 				print_line($line);
-				#print "5-print-last.\n";
+				# print "5-print-last.\n";
 			}
 		}
 	}
@@ -6252,14 +6644,14 @@ sub print_data {
 	my ($b_container,$indent_use,$indentx) = (0,0,0);
 	# $size{'max'} = 88;
 	# NOTE: indent < 11 would break the output badly in some cases
-	if ($size{'max'} < $size{'wrap-max'} || $size{'indent'} < 11 ){
+	if ($size{'max'} < $size{'wrap-max'} || $size{'indent'} < 11){
 		$indent = 2;
 	}
-	#foreach my $key1 (sort { (split('#', $a))[0] <=> (split('#', $b))[0] } keys %$data) {
-	foreach my $key1 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %$data) {
-	#foreach my $key1 (sort { $a cmp $b } keys %$data) {
+	# foreach my $key1 (sort { (split('#', $a))[0] <=> (split('#', $b))[0] } keys %$data){
+	foreach my $key1 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %$data){
+	# foreach my $key1 (sort { $a cmp $b } keys %$data){
 		$key = (split('#', $key1))[3];
-		if ($key ne 'SHORT' ) {
+		if ($key ne 'SHORT'){
 			$start = sprintf("$colors{'c1'}%-${indent}s$colors{'cn'}","$key$sep{'s1'}");
 			$start_holder = $key;
 			if ($indent < 10){
@@ -6290,6 +6682,7 @@ sub print_data {
 		'Monitor' => 1,
 		'Optical' => 1,
 		'Screen' => 1,
+		'Sound Server' => 1,
 		'variant' => 1, # arm > 1 cpu type
 		);
 		foreach my $val1 (@{$data->{$key1}}){
@@ -6297,9 +6690,9 @@ sub print_data {
 			if (ref($val1) eq 'HASH'){
 				#%row = %$val1;
 				($counter,$split_count) = (0,0);
-				#foreach my $key2 (sor ({ (split('#', $a))[0] <=> (split('#', $b))[0] } keys %$val1){
+				# foreach my $key2 (sor ({ (split('#', $a))[0] <=> (split('#', $b))[0] } keys %$val1){
 				foreach my $key2 (sort { substr($a,0,3) <=> substr($b,0,3) } keys %$val1){
-				#foreach my $key2 (sort { $a cmp $b } keys %$val1){
+				# foreach my $key2 (sort { $a cmp $b } keys %$val1){
 					($hash_id,$b_container,$indentx,$key) = (split('#', $key2));
 					if ($start_holder eq 'Graphics' && $key eq 'Screen'){
 						$ids{'Monitor'} = 1;
@@ -6328,17 +6721,17 @@ sub print_data {
 					# in Perl 5.08 oddly enough.
 					@temp = split(/\s+/, $val2);
 					$split_count = scalar @temp;
-					if ( !$b_single && ( length( "$key$sep{'s2'} $val2" ) + $length ) < $size{'max'} ) {
-						#print "one\n";
+					if (!$b_single && (length("$key$sep{'s2'} $val2") + $length) < $size{'max'}){
+						# print "one\n";
 						$length += length("$key$sep{'s2'} $val2");
 						$holder .= "$colors{'c1'}$key$sep{'s2'}$colors{'c2'} $val2";
 					}
 					# handle case where the opening key/value pair is > max, and where 
 					# there are a lot of terms, like cpu flags, raid types supported. Raid
 					# can have the last row have a lot of devices, or many raid types
-					elsif ( !$b_single && ( length( "$key$sep{'s2'} $val2" ) + $indent ) > $size{'max'} && 
-								!defined $ids{$key} && $split_count > 2 ) {
-						#print "two\n";
+					elsif (!$b_single && (length("$key$sep{'s2'} $val2") + $indent) > $size{'max'} && 
+								!defined $ids{$key} && $split_count > 2){
+						# print "two\n";
 						@values = split(/\s+/, $val2);
 						$val3 = shift @values;
 						# $length += length("$key$sep{'s2'} $val3 ") + $indent;
@@ -6348,10 +6741,10 @@ sub print_data {
 						# print scalar @values,"\n";
 						foreach (@values){
 							# my $l =  (length("$_ ") + $length);
-							#print "$l\n";
-							if ( (length("$_ ") + $length) < $size{'max'} ){
-								#print "three.1\n";
-								#print "a\n";
+							# print "$l\n";
+							if ((length("$_ ") + $length) < $size{'max'}){
+								# print "three.1\n";
+								# print "a\n";
 								if ($start2){
 									$holder2 .= "$start2$_ ";
 									$start2 = '';
@@ -6364,19 +6757,19 @@ sub print_data {
 								$length += length("$_ ");
 							}
 							else {
-								#print "three.2\n";
+								# print "three.2\n";
 								if ($start2){
 									$holder2 = "$start2$holder2";
 								}
 								else {
 									$holder2 = "$colors{'c2'}$holder2";
 								}
-								#print "xx:$holder";
+								# print "xx:$holder";
 								$line = sprintf("%-${indent}s%s$colors{'cn'}\n","$start","$holder$holder2");
 								print_line($line);
 								$holder = '';
 								$holder2 = "$_ ";
-								#print "h2: $holder2\n";
+								# print "h2: $holder2\n";
 								$length = length($holder2) + $indent;
 								$start2 = '';
 								$start = '';
@@ -6384,7 +6777,7 @@ sub print_data {
 							}
 						}
 						if ($holder2 !~ /^\s*$/){
-							#print "four\n";
+							# print "four\n";
 							$holder2 = "$colors{'c2'}$holder2";
 							$line = sprintf("%-${indent}s%s$colors{'cn'}\n","$start","$holder$holder2");
 							print_line($line);
@@ -6398,16 +6791,16 @@ sub print_data {
 					}
 					# NOTE: only these and the last fallback are used for b_single output
 					else {
-						#print "H: $counter " . scalar %$val1 . " $indent3 $indent2\n";
+						# print "H: $counter " . scalar %$val1 . " $indent3 $indent2\n";
 						if ($holder){
-							#print "five\n";
+							# print "five\n";
 							$line = sprintf("%-${indent_use}s%s$colors{'cn'}\n",$start,"$holder");
 							$length = length("$key$sep{'s2'} $val2") + $indent_use;
 							print_line($line);
 							$start = '';
 						}
 						else {
-							#print "six\n";
+							# print "six\n";
 							$length = $indent_use;
 							#$holder = '';
 						}
@@ -6417,7 +6810,7 @@ sub print_data {
 					$indent_use = ($indent * $indentx) if $b_single;
 				}
 				if ($holder !~ /^\s*$/){
-					#print "seven\n";
+					# print "seven\n";
 					$line = sprintf("%-${indent_use}s%s$colors{'cn'}\n",$start,"$start2$holder");
 					print_line($line);
 					$holder = '';
@@ -6427,7 +6820,7 @@ sub print_data {
 			}
 			# only for repos currently
 			elsif (ref($val1) eq 'ARRAY'){
-				#print "eight\n";
+				# print "eight\n";
 				$array=0;
 				foreach my $item (@$val1){
 					$array++;
@@ -6449,13 +6842,13 @@ sub print_line {
 		$client{'konvi'} = 3;
 		$client{'dobject'} = 'Konversation';
 	}
-	if ($client{'konvi'} == 1 && $client{'dcop'} ){
+	if ($client{'konvi'} == 1 && $client{'dcop'}){
 		# konvi doesn't seem to like \n characters, it just prints them literally
 		$line =~ s/\n//g;
 		#qx('dcop "$client{'dport'}" "$client{'dobject'}" say "$client{'dserver'}" "$client{'dtarget'}" "$line 1");
 		system('dcop', $client{'dport'}, $client{'dobject'}, 'say', $client{'dserver'}, $client{'dtarget'}, "$line 1");
 	}
-	elsif ($client{'konvi'} == 3 && $client{'qdbus'} ){
+	elsif ($client{'konvi'} == 3 && $client{'qdbus'}){
 		# print $line;
 		$line =~ s/\n//g;
 		#qx(qdbus org.kde.konversation /irc say "$client{'dserver'}" "$client{'dtarget'}" "$line");
@@ -6467,22 +6860,22 @@ sub print_line {
 }
 
 ########################################################################
-#### DATA PROCESSORS
+#### ITEM PROCESSORS
 ########################################################################
 
 #### -------------------------------------------------------------------
-#### PRIMARY DATA GENERATORS
+#### ITEM GENERATORS
 #### -------------------------------------------------------------------
 
-## AudioData 
+## AudioItem 
 {
-package AudioData;
+package AudioItem;
 
 sub get {
 	eval $start if $b_log;
 	my (@rows);
 	my $num = 0;
-	if (($b_arm || $b_mips) && !$b_soc_audio && !$b_pci_tool){
+	if (($b_arm || $b_mips) && !$use{'soc-audio'} && !$use{'pci-tool'}){
 		my $type = ($b_arm) ? 'arm' : 'mips';
 		my $key = 'Message';
 		push(@rows,{
@@ -6492,8 +6885,8 @@ sub get {
 	else {
 		push(@rows,device_output());
 	}
-	if ( ( (($b_arm || $b_mips) && !$b_soc_audio && !$b_pci_tool) || !@rows ) && 
-	   (my $file = main::system_files('asound-cards') ) ){
+	if (((($b_arm || $b_mips) && !$use{'soc-audio'} && !$use{'pci-tool'}) || !@rows) && 
+	   (my $file = $system_files{'asound-cards'})){
 		push(@rows,asound_output($file));
 	}
 	push(@rows,usb_output());
@@ -6514,29 +6907,30 @@ sub get {
 
 sub device_output {
 	eval $start if $b_log;
+	return if !$devices{'audio'};
 	my (@rows);
 	my ($j,$num) = (0,1);
-	foreach my $row (@devices_audio){
+	foreach my $row (@{$devices{'audio'}}){
 		$num = 1;
 		$j = scalar @rows;
 		my $driver = $row->[9];
 		$driver ||= 'N/A';
-		my $card = $row->[4];
-		$card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
+		my $device = $row->[4];
+		$device = ($device) ? main::pci_cleaner($device,'output') : 'N/A';
 		# have seen absurdly verbose card descriptions, with non related data etc
-		if (length($card) > 85 || $size{'max'} < 110){
-			$card = main::pci_long_filter($card);
+		if (length($device) > 85 || $size{'max'} < 110){
+			$device = main::pci_long_filter($device);
 		}
 		push(@rows, {
-		main::key($num++,1,1,'Device') => $card,
+		main::key($num++,1,1,'Device') => $device,
 		},);
-		if ($extra > 0 && $b_pci_tool && $row->[12]){
+		if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
 			my $item = main::get_pci_vendor($row->[4],$row->[12]);
 			$rows[$j]->{main::key($num++,0,2,'vendor')} = $item if $item;
 		}
 		$rows[$j]->{main::key($num++,1,2,'driver')} = $driver;
 		if ($extra > 0 && !$bsd_type){
-			if ($row->[9] ){
+			if ($row->[9]){
 				my $version = main::get_module_version($row->[9]);
 				$rows[$j]->{main::key($num++,0,3,'v')} = $version if $version;
 			}
@@ -6546,7 +6940,7 @@ sub device_output {
 			$rows[$j]->{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
 		}
 		if ($extra > 0){
-			$rows[$j]->{main::key($num++,0,2,'bus ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
 		}
 		if ($extra > 1){
 			my $chip_id = 'N/A';
@@ -6556,12 +6950,12 @@ sub device_output {
 			elsif ($row->[6]){
 				$chip_id = $row->[6];
 			}
-			$rows[$j]->{main::key($num++,0,2,'chip ID')} = $chip_id;
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $chip_id;
 			if ($extra > 2 && $row->[1]){
-				$rows[$j]->{main::key($num++,0,2,'class ID')} = $row->[1];
+				$rows[$j]->{main::key($num++,0,2,'class-ID')} = $row->[1];
 			}
 		}
-		#print "$row->[0]\n";
+		# print "$row->[0]\n";
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -6573,23 +6967,23 @@ sub asound_output {
 	eval $start if $b_log;
 	my ($file) = @_;
 	my (@asound,@rows);
-	my ($card,$driver,$j,$num) = ('','',0,1);
+	my ($device,$driver,$j,$num) = ('','',0,1);
 	@asound = main::reader($file);
 	foreach (@asound){
 		# filtering out modems and usb devices like webcams, this might get a
 		# usb audio card as well, this will take some trial and error
-		if ( !/modem|usb/i && /^\s*[0-9]/ ) {
+		if (!/modem|usb/i && /^\s*[0-9]/){
 			$num = 1;
 			my @working = split(/:\s*/, $_);
 			# now let's get 1 2
 			$working[1] =~ /(.*)\s+-\s+(.*)/;
-			$card = $2;
+			$device = $2;
 			$driver = $1;
-			if ( $card ){
+			if ($device){
 				$j = scalar @rows;
 				$driver ||= 'N/A';
 				push(@rows, {
-				main::key($num++,1,1,'Device') => $card,
+				main::key($num++,1,1,'Device') => $device,
 				main::key($num++,1,2,'driver') => $driver,
 				},);
 				if ($extra > 0){
@@ -6606,109 +7000,140 @@ sub asound_output {
 }
 sub usb_output {
 	eval $start if $b_log;
-	my (@rows,@ids,$driver,$path_id,$product,@temp2);
+	my (@rows,@ids,$path_id,$product,@temp2);
 	my ($j,$num) = (0,1);
-	if (-d '/proc/asound') {
-		# note: this will double the data, but it's easier this way.
-		# inxi tested for -L in the /proc/asound files, and used only those.
-		my @files = main::globber('/proc/asound/*/usbid');
-		foreach (@files){
-			my $id = main::reader($_,'',0);
-			push(@ids, $id) if ($id && ! grep {/$id/} @ids);
+	return if !$usb{'audio'};
+	foreach my $row (@{$usb{'audio'}}){
+		# print Data::Dumper::Dumper $row;
+		$num = 1;
+		# make sure to reset, or second device trips last flag
+		($path_id,$product) = ('','');
+		$product = main::cleaner($row->[13]) if $row->[13];
+		$path_id = $row->[2] if $row->[2];
+		$product ||= 'N/A';
+		$row->[15] ||= 'N/A';
+		push(@rows, {
+		main::key($num++,1,1,'Device') => $product,
+		main::key($num++,0,2,'type') => 'USB',
+		main::key($num++,0,2,'driver') => $row->[15],
+		},);
+		if ($extra > 0){
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
 		}
-		# lsusb is a very expensive operation
-		if (@ids){
-			if (!$bsd_type && !$b_usb_check){
-				main::USBData::set();
-			}
+		if ($extra > 1){
+			$row->[7] ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $row->[7];
 		}
-		main::log_data('dump','@ids',\@ids) if $b_log;
-		return if !@usb;
-		foreach my $id (@ids){
-			$j = scalar @rows;
-			foreach my $row (@usb){
-				# a device will always be the second or > device on the bus
-				if ($row->[1] > 1 && $row->[7] eq $id){
-					# print Data::Dumper::Dumper $row;
-					$num = 1;
-					# makre sure to reset, or second device trips last flag
-					($driver,$path_id,$product) = ('','','');
-					$product = main::cleaner($row->[13]) if $row->[13];
-					$driver = $row->[15] if $row->[15];
-					$path_id = $row->[2] if $row->[2];
-					$product ||= 'N/A';
-					$driver ||= 'snd-usb-audio';
-					push(@rows, {
-					main::key($num++,1,1,'Device') => $product,
-					main::key($num++,0,2,'type') => 'USB',
-					main::key($num++,0,2,'driver') => $driver,
-					},);
-					if ($extra > 0){
-						$rows[$j]->{main::key($num++,0,2,'bus ID')} = "$path_id:$row->[1]";
-					}
-					if ($extra > 1){
-						$row->[7] ||= 'N/A';
-						$rows[$j]->{main::key($num++,0,2,'chip ID')} = $row->[7];
-					}
-					if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
-						$rows[$j]->{main::key($num++,0,2,'class ID')} = "$row->[4]$row->[5]";
-					}
-					if ($extra > 2 && $row->[16]){
-						$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
-					}
-				}
-			}
+		if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
 		}
+		if ($extra > 2 && $row->[16]){
+			$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
+		}
+		$j = scalar @rows;
 	}
 	eval $end if $b_log;
 	return @rows;
 }
-
 sub sound_server_output {
 	eval $start if $b_log;
-	my (@data,$server,$version);
-	my $num = 0;
-	if (my $file = main::system_files('asound-version') ){
+	my (@rows,$program);
+	my ($j,$num) = (0,0);
+	my @servers = sound_server_data();
+	foreach my $server (@servers){
+		next if $extra < 1 && (!$server->[2] || $server->[2] ne 'yes');
+		$j = scalar @rows;
+		$server->[1] ||= 'N/A';
+		$server->[2] ||= 'N/A';
+		push(@rows, {
+		main::key($num++,1,1,'Sound Server') => $server->[0],
+		main::key($num++,0,2,'v') => $server->[1],
+		main::key($num++,0,2,'running') => $server->[2],
+		});
+	}
+	eval $end if $b_log;
+	return @rows;
+}
+sub sound_server_data {
+	eval $start if $b_log;
+	my (@servers,$program,$running,$server,$version);
+	if (my $file = $system_files{'asound-version'}){
+		# avoid possible second line if compiled by user
 		my $content = main::reader($file,'',0);
 		# some alsa strings have the build date in (...)
-		# remove trailing . and remove possible second line if compiled by user
-# 		foreach (@content){
-# 			if (!/compile/i){
-				#$_ =~ s/Advanced Linux Sound Architecture/ALSA/;
-				$version = (split(/\s+/, $content))[-1];
-				$version =~ s/\.$//; # trim off period
-				$server = 'ALSA';
-# 			}
-# 		}
+		$version = (split(/\s+/, $content))[-1];
+		$version =~ s/\.$//; # trim off period
+		$server = 'ALSA';
+		$running = 'yes';
+		# not needed I think, if asound is there, it's running, but if that's
+		# not correct, can use one of the info/list/stat tests for aplay
+		# if (main::check_program('aplay') && main::grabber('aplay -l 2>/dev/null')){
+		# 	$running = 'yes';
+		# }
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
 	}
-	elsif (my $program = main::check_program('oss')){
+	# sndstat file may be removed in linux oss
+	if (-e '/dev/sndstat' || ($program = main::check_program('ossinfo'))){
 		$server = 'OSS';
-		$version = main::program_version('oss','\S',2);
-		$version ||= 'N/A';
-	}
-	if ($server){
-		@data = ({
-		main::key($num++,1,1,'Sound Server') => $server,
-		main::key($num++,0,2,'v') => $version,
-		},);
-	}
-	eval $end if $b_log;
-	return @data;
-}
-}
-
-## BatteryData
+		#$version = main::program_version('oss','\S',2);
+		$version = (grep {/^hw.snd.version:/} @{$sysctl{'audio'}})[0] if $sysctl{'audio'};
+		$version = (split(/:\s*/,$version),1)[1] if $version;
+		$version =~ s|/.*$|| if $version;
+		# not a great test, but ok for now
+		$running = (-e '/dev/sndstat') ? 'yes' : 'no?';
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
+	}
+	if ($program = main::check_program('sndiod')){
+		$server = 'sndio';
+		#$version = main::program_version('sndio','\S',2);
+		$running = (grep {/sndiod/} @ps_cmd) ? 'yes': 'no';
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
+	}
+	if ($program = main::check_program('jackd')){
+		$server = 'JACK';
+		$version = main::program_version($program,'^jackd',3,'--version',1);
+		$running = (grep {/jackd/} @ps_cmd) ? 'yes':'no' ;
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
+	}
+	# note: pactl info/list/stat could be used
+	if ($program = main::check_program('pactl')){
+		$server = 'PulseAudio';
+		$version = main::program_version($program,'^pactl',2,'--version',1);
+		$running = (grep {m|/pulseaudiod?\b|} @ps_cmd) ? 'yes':'no' ;
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
+	}
+	if ($program = main::check_program('pipewire')){
+		$server = 'PipeWire';
+		$version = main::program_version($program,'^Compiled with libpipe',4,'--version',1);
+		$running = (grep {/pipewire/} @ps_cmd) ? 'yes':'no' ;
+		push(@servers, [$server,$version,$running]);
+		($running,$server,$version) = ('','','');
+	}
+	main::log_data('dump','sound servers: @servers',\@servers) if $b_log;
+	print Data::Dumper::Dumper \@servers if $dbg[26];
+	return @servers;
+	eval $end if $b_log;
+}
+}
+
+## BatteryItem
 {
-package BatteryData;
+package BatteryItem;
+
 my (@upower_items,$b_upower,$upower);
 sub get {
 	eval $start if $b_log;
 	my (@rows,%battery,$key1,$val1);
 	my $num = 0;
-	if ($bsd_type || $b_dmidecode_force){
+	if ($force{'dmidecode'}){
 		if ($alerts{'dmidecode'}->{'action'} ne 'use'){
 			$key1 = $alerts{'dmidecode'}->{'action'};
-			$val1 = $alerts{'dmidecode'}->{$key1};
+			$val1 = $alerts{'dmidecode'}->{'message'};
 			$key1 = ucfirst($key1);
 			@rows = ({main::key($num++,0,1,$key1) => $val1,});
 		}
@@ -6726,6 +7151,19 @@ sub get {
 			}
 		}
 	}
+	elsif ($bsd_type && ($sysctl{'battery'} || $show{'battery-forced'})){
+		%battery = battery_data_sysctl() if $sysctl{'battery'};
+		if (!%battery){
+			if ($show{'battery-forced'}){
+				$key1 = 'Message';
+				$val1 = main::row_defaults('battery-data-bsd','');
+				@rows = ({main::key($num++,0,1,$key1) => $val1,});
+			}
+		}
+		else {
+			@rows = battery_output(\%battery);
+		}
+	}
 	elsif (-d '/sys/class/power_supply/'){
 		%battery = battery_data_sys();
 		if (!%battery){
@@ -6742,7 +7180,7 @@ sub get {
 	else {
 		if ($show{'battery-forced'}){
 			$key1 = 'Message';
-			$val1 = main::row_defaults('battery-data-sys','');
+			$val1 = (!$bsd_type) ? main::row_defaults('battery-data-sys'): main::row_defaults('battery-data-bsd');
 			@rows = ({main::key($num++,0,1,$key1) => $val1,});
 		}
 	}
@@ -6780,13 +7218,17 @@ sub battery_output {
 	# print Data::Dumper::Dumper $battery;
 	foreach $key (sort keys %$battery){
 		$num = 0;
-		my ($charge,$condition,$model,$serial,$status,$volts) = ('','','','','','');
+		my ($charge,$condition,$model,$serial,$status) = ('','','','','');
 		my ($chemistry,$cycles,$location) = ('','','');
 		next if !$battery->{$key}{'purpose'} || $battery->{$key}{'purpose'} ne 'primary';
 		# $battery->{$key}{''};
 		# we need to handle cases where charge or energy full is 0
 		if (defined $battery->{$key}{'energy_now'} && $battery->{$key}{'energy_now'} ne ''){
 			$charge = "$battery->{$key}{'energy_now'} Wh";
+			if ($battery->{$key}{'energy_full'} && main::is_numeric($battery->{$key}{'energy_full'})){
+				my $percent = sprintf("%.1f", $battery->{$key}{'energy_now'}/$battery->{$key}{'energy_full'}*100);
+				$charge .= ' (' . $percent  . '%)';
+			}
 		}
 		# better than nothing, shows the charged percent
 		elsif (defined $battery->{$key}{'capacity'} && $battery->{$key}{'capacity'} ne ''){
@@ -6810,17 +7252,17 @@ sub battery_output {
 		main::key($num++,0,2,'charge') => $charge,
 		main::key($num++,0,2,'condition') => $condition,
 		},);
-		if ($extra > 0){
-			if ($extra > 1){
-				if ($battery->{$key}{'voltage_min_design'} || $battery->{$key}{'voltage_now'}){
-					$battery->{$key}{'voltage_min_design'} ||= 'N/A';
-					$battery->{$key}{'voltage_now'} ||= 'N/A';
-					$volts = "$battery->{$key}{'voltage_now'}/$battery->{$key}{'voltage_min_design'}";
-				}
-				$volts ||= 'N/A';
-				$rows[$j]->{main::key($num++,0,2,'volts')} = $volts;
+		if ($extra > 0 || ($battery->{$key}{'voltage_now'} && $battery->{$key}{'voltage_min_design'} && 
+		 ($battery->{$key}{'voltage_now'} - $battery->{$key}{'voltage_min_design'}) < 0.5)){
+			$battery->{$key}{'voltage_now'} ||= 'N/A';
+			$rows[$j]->{main::key($num++,1,2,'volts')} = $battery->{$key}{'voltage_now'};
+			if ($battery->{$key}{'voltage_now'} ne 'N/A' || $battery->{$key}{'voltage_min_design'}){
+				$battery->{$key}{'voltage_min_design'} ||= 'N/A';
+				$rows[$j]->{main::key($num++,0,3,'min')} = $battery->{$key}{'voltage_min_design'};
 			}
-			if ($battery->{$key}{'manufacturer'} || $battery->{$key}{'model_name'}) {
+		}
+		if ($extra > 0){
+			if ($battery->{$key}{'manufacturer'} || $battery->{$key}{'model_name'}){
 				if ($battery->{$key}{'manufacturer'} && $battery->{$key}{'model_name'}){
 					$model = "$battery->{$key}{'manufacturer'} $battery->{$key}{'model_name'}";
 				}
@@ -6836,7 +7278,7 @@ sub battery_output {
 			}
 			$rows[$j]->{main::key($num++,0,2,'model')} = $model;
 			if ($extra > 2){
-				$chemistry = ( $battery->{$key}{'technology'} ) ? $battery->{$key}{'technology'}: 'N/A';
+				$chemistry = ($battery->{$key}{'technology'}) ? $battery->{$key}{'technology'}: 'N/A';
 				$rows[$j]->{main::key($num++,0,2,'type')} = $chemistry;
 			}
 			if ($extra > 1){
@@ -6918,8 +7360,8 @@ sub battery_data_sys {
 	# note: there is no 'location' file, but dmidecode has it
 	# 'type' is generic, like: Battery, Mains
 	# capacity_level is a string, like: Normal
-	my @items = qw(alarm capacity capacity_level charge_full charge_full_design charge_now 
-	constant_charge_current constant_charge_current_max cycle_count 
+	my @items = qw(alarm capacity capacity_level charge_full charge_full_design 
+	charge_now constant_charge_current constant_charge_current_max cycle_count 
 	energy_full energy_full_design energy_now location manufacturer model_name 
 	power_now present scope serial_number status technology type voltage_min_design voltage_now);
 	foreach $item (@batteries){
@@ -6931,7 +7373,7 @@ sub battery_data_sys {
 			# android shows some files only root readable
 			$value = (-r $path) ? main::reader($path,'',0): '';
 			# mains, plus in psu
-			if ($file eq 'type' && $value && lc($value) ne 'battery' ){
+			if ($file eq 'type' && $value && lc($value) ne 'battery'){
 				$battery{$id}->{'purpose'} = 'mains';
 			}
 			if ($value){
@@ -6975,7 +7417,7 @@ sub battery_data_sys {
 					$value = main::dmi_cleaner($value);
 				}
 			}
-			elsif ($b_root && -e $path && ! -r $path ){
+			elsif ($b_root && -e $path && ! -r $path){
 				$value = main::row_defaults('root-required');
 			}
 			$battery{$id}->{$file} = $value;
@@ -6987,10 +7429,10 @@ sub battery_data_sys {
 			# if the energy/charge values exist for this item, if so, it's a battery, if not, 
 			# it's a device.
 			if ($id =~ /^(BAT|CMB).*$/i || 
-			    ( $battery{$id}->{'energy_full'} || $battery{$id}->{'charge_full'} || 
-			    $battery{$id}->{'energy_now'} || $battery{$id}->{'charge_now'} || 
-			    $battery{$id}->{'energy_full_design'} || $battery{$id}->{'charge_full_design'} ) || 
-			    $battery{$id}->{'voltage_min_design'} || $battery{$id}->{'voltage_now'} ){
+			 ($battery{$id}->{'energy_full'} || $battery{$id}->{'charge_full'} || 
+			 $battery{$id}->{'energy_now'} || $battery{$id}->{'charge_now'} || 
+			 $battery{$id}->{'energy_full_design'} || $battery{$id}->{'charge_full_design'}) || 
+			 $battery{$id}->{'voltage_min_design'} || $battery{$id}->{'voltage_now'}){
 				$battery{$id}->{'purpose'} =  'primary';
 			}
 			else {
@@ -7012,28 +7454,108 @@ sub battery_data_sys {
 				$battery{$id}->{'energy_full_design'} = $battery{$id}->{'charge_full_design'} * $battery{$id}->{'voltage_min_design'};
 			}
 		}
-		if ( $battery{$id}->{'energy_now'} && $battery{$id}->{'energy_full'} ){
+		if ($battery{$id}->{'energy_now'} && $battery{$id}->{'energy_full'}){
 			$battery{$id}->{'capacity'} = 100 * $battery{$id}->{'energy_now'}/$battery{$id}->{'energy_full'};
 			$battery{$id}->{'capacity'} = sprintf("%.1f", $battery{$id}->{'capacity'});
 		}
-		if ( $battery{$id}->{'energy_full_design'} && $battery{$id}->{'energy_full'} ){
+		if ($battery{$id}->{'energy_full_design'} && $battery{$id}->{'energy_full'}){
 			$battery{$id}->{'of_orig'} = 100 * $battery{$id}->{'energy_full'}/$battery{$id}->{'energy_full_design'};
-			$battery{$id}->{'of_orig'} = sprintf("%.0f", $battery{$id}->{'of_orig'});
+			$battery{$id}->{'of_orig'} = sprintf("%.1f", $battery{$id}->{'of_orig'});
 		}
-		if ( $battery{$id}->{'energy_now'} ){
+		if ($battery{$id}->{'energy_now'}){
 			$battery{$id}->{'energy_now'} = sprintf("%.1f", $battery{$id}->{'energy_now'});
 		}
-		if ( $battery{$id}->{'energy_full_design'} ){
+		if ($battery{$id}->{'energy_full_design'}){
 			$battery{$id}->{'energy_full_design'} = sprintf("%.1f",$battery{$id}->{'energy_full_design'});
 		}
-		if ( $battery{$id}->{'energy_full'} ){
+		if ($battery{$id}->{'energy_full'}){
 			$battery{$id}->{'energy_full'} = sprintf("%.1f", $battery{$id}->{'energy_full'});
 		}
 	}
+	print Data::Dumper::Dumper \%battery if $dbg[33];
 	main::log_data('dump','sys: %battery',\%battery) if $b_log;
 	eval $end if $b_log;
 	return %battery;
 }
+sub battery_data_sysctl {
+	eval $start if $b_log;
+	my (%battery,$id);
+	for (@{$sysctl{'battery'}}){
+		if (/^(hw\.sensors\.)acpi([^\.]+)(\.|:)/){
+			$id = uc($2);
+		}
+		if (/volt[^:]+:([0-9\.]+)\s+VDC\s+\(voltage\)/){
+			$battery{$id}->{'voltage_min_design'} = $1;
+		}
+		elsif (/volt[^:]+:([0-9\.]+)\s+VDC\s+\(current voltage\)/){
+			$battery{$id}->{'voltage_now'} = $1;
+		}
+		elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(design capacity\)/){
+			$battery{$id}->{'energy_full_design'} = $1;
+		}
+		elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(last full capacity\)/){
+			$battery{$id}->{'energy_full'} = $1;
+		}
+		elsif (/watthour[^:]+:([0-9\.]+)\s+Wh\s+\(remaining capacity\)/){
+			$battery{$id}->{'energy_now'} = $1;
+		}
+		elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(design capacity\)/){
+			$battery{$id}->{'charge_full_design'} = $1;
+		}
+		elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(last full capacity\)/){
+			$battery{$id}->{'charge_full'} = $1;
+		}
+		elsif (/amphour[^:]+:([0-9\.]+)\s+Ah\s+\(remaining capacity\)/){
+			$battery{$id}->{'charge_now'} = $1;
+		}
+		elsif (/raw[^:]+:[0-9\.]+\s+\((battery) ([^\)]+)\)/){
+			$battery{$id}->{'status'} = $2;
+		}
+		elsif (/^acpi[\S]+:at [^:]+:\s*$id\s+model\s+(.*?)\s*serial\s+([\S]*?)\s*type\s+(.*?)\s*oem\s+(.*)/i){
+			$battery{$id}->{'model_name'} = main::dmi_cleaner($1);
+			$battery{$id}->{'serial_number'} = $2;
+			$battery{$id}->{'technology'} = $3;
+			$battery{$id}->{'manufacturer'} = main::dmi_cleaner($4);
+		}
+	}
+	# then do the condition/charge percent math
+	for my $id (keys %battery){
+		$battery{$id}->{'purpose'} = 'primary';
+		# CHARGE is Ah, which are converted to Wh by: Ah x voltage. 
+		if ($battery{$id}->{'voltage_min_design'}){
+			if ($battery{$id}->{'charge_now'}){
+				$battery{$id}->{'energy_now'} = $battery{$id}->{'charge_now'} * $battery{$id}->{'voltage_min_design'};
+			}
+			if ($battery{$id}->{'charge_full'}){
+				$battery{$id}->{'energy_full'} = $battery{$id}->{'charge_full'}*$battery{$id}->{'voltage_min_design'};
+			}
+			if ($battery{$id}->{'charge_full_design'}){
+				$battery{$id}->{'energy_full_design'} = $battery{$id}->{'charge_full_design'} * $battery{$id}->{'voltage_min_design'};
+			}
+		}
+		if ($battery{$id}->{'energy_full_design'} && $battery{$id}->{'energy_full'}){
+			$battery{$id}->{'of_orig'} = 100 * $battery{$id}->{'energy_full'}/$battery{$id}->{'energy_full_design'};
+			$battery{$id}->{'of_orig'} = sprintf("%.1f", $battery{$id}->{'of_orig'});
+		}
+		if ($battery{$id}->{'energy_now'} && $battery{$id}->{'energy_full'}){
+			$battery{$id}->{'capacity'} = 100 * $battery{$id}->{'energy_now'}/$battery{$id}->{'energy_full'};
+			$battery{$id}->{'capacity'} = sprintf("%.1f", $battery{$id}->{'capacity'});
+		}
+		if ($battery{$id}->{'energy_now'}){
+			$battery{$id}->{'energy_now'} = sprintf("%.1f", $battery{$id}->{'energy_now'});
+		}
+		if ($battery{$id}->{'energy_full'}){
+			$battery{$id}->{'energy_full'} = sprintf("%.1f", $battery{$id}->{'energy_full'});
+		}
+		if ($battery{$id}->{'energy_full_design'}){
+			$battery{$id}->{'energy_full_design'} = sprintf("%.1f", $battery{$id}->{'energy_full_design'});
+		}
+	}
+	print Data::Dumper::Dumper \%battery if $dbg[33];
+	main::log_data('dump','dmi: %battery',\%battery) if $b_log;
+	eval $end if $b_log;
+	return %battery;
+}
 # note, dmidecode does not have charge_now or charge_full
 sub battery_data_dmi {
 	eval $start if $b_log;
@@ -7049,25 +7571,25 @@ sub battery_data_dmi {
 			foreach my $item (@$row[3 .. $#$row]){
 				my @value = split(/:\s+/, $item);
 				next if !$value[0];
-				if ($value[0] eq 'Location') {$battery{$id}->{'location'} = $value[1] }
-				elsif ($value[0] eq 'Manufacturer') {$battery{$id}->{'manufacturer'} = main::dmi_cleaner($value[1]) }
-				elsif ($value[0] =~ /Chemistry/) {$battery{$id}->{'technology'} = $value[1] }
-				elsif ($value[0] =~ /Serial Number/) {$battery{$id}->{'serial_number'} = $value[1] }
-				elsif ($value[0] =~ /^Name/) {$battery{$id}->{'model_name'} = main::dmi_cleaner($value[1]) }
-				elsif ($value[0] eq 'Design Capacity') {
+				if ($value[0] eq 'Location'){$battery{$id}->{'location'} = $value[1] }
+				elsif ($value[0] eq 'Manufacturer'){$battery{$id}->{'manufacturer'} = main::dmi_cleaner($value[1]) }
+				elsif ($value[0] =~ /Chemistry/){$battery{$id}->{'technology'} = $value[1] }
+				elsif ($value[0] =~ /Serial Number/){$battery{$id}->{'serial_number'} = $value[1] }
+				elsif ($value[0] =~ /^Name/){$battery{$id}->{'model_name'} = main::dmi_cleaner($value[1]) }
+				elsif ($value[0] eq 'Design Capacity'){
 					$value[1] =~ s/\s*mwh$//i;
 					$battery{$id}->{'energy_full_design'} = sprintf("%.1f", $value[1]/1000);
 				}
-				elsif ($value[0] eq 'Design Voltage') {
+				elsif ($value[0] eq 'Design Voltage'){
 					$value[1] =~ s/\s*mv$//i;
 					$battery{$id}->{'voltage_min_design'} = sprintf("%.1f", $value[1]/1000);
 				}
 			}
-			if ($battery{$id}->{'energy_now'} && $battery{$id}->{'energy_full'} ){
+			if ($battery{$id}->{'energy_now'} && $battery{$id}->{'energy_full'}){
 				$battery{$id}->{'capacity'} = 100 * $battery{$id}->{'energy_now'} / $battery{$id}->{'energy_full'};
 				$battery{$id}->{'capacity'} = sprintf("%.1f%", $battery{$id}->{'capacity'});
 			}
-			if ($battery{$id}->{'energy_full_design'} && $battery{$id}->{'energy_full'} ){
+			if ($battery{$id}->{'energy_full_design'} && $battery{$id}->{'energy_full'}){
 				$battery{$id}->{'of_orig'} = 100 * $battery{$id}->{'energy_full'} / $battery{$id}->{'energy_full_design'};
 				$battery{$id}->{'of_orig'} = sprintf("%.0f%", $battery{$id}->{'of_orig'});
 			}
@@ -7076,7 +7598,7 @@ sub battery_data_dmi {
 			last;
 		}
 	}
-	# print Data::Dumper::Dumper \%battery;
+	print Data::Dumper::Dumper \%battery if $dbg[33];
 	main::log_data('dump','dmi: %battery',\%battery) if $b_log;
 	eval $end if $b_log;
 	return %battery;
@@ -7110,25 +7632,29 @@ sub upower_data {
 	eval $end if $b_log;
 	return %data;
 }
-
 }
 
-## BluetoothData 
+## BluetoothItem 
 {
-package BluetoothData;
-my ($b_hci_error,$b_hci,%hci);
+package BluetoothItem;
+
+my ($b_bluetooth,$b_hci_error,$b_hci,$b_rfk,$b_service);
+my ($service);
+my (%hci);
 sub get {
 	eval $start if $b_log;
 	my (@rows);
 	my $num = 0;
-	if (($b_arm || $b_mips) && !$b_soc_bluetooth && !$b_pci_tool){
+	$b_bluetooth = 1 if @ps_cmd && (grep {m|/bluetoothd\b|} @ps_cmd);
+	# note: rapi 4 has pci bus
+	if (($b_arm || $b_mips) && !$use{'soc-bluetooth'} && !$use{'pci-tool'}){
 		# do nothing, but keep the test conditions to force 
 		# the non arm case to always run
-		#my $type = ($b_arm) ? 'arm' : 'mips';
-		#my $key = 'Message';
-		#push(@rows,{
-		#main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
-		#},);
+		# my $type = ($b_arm) ? 'arm' : 'mips';
+		# my $key = 'Message';
+		# push(@rows,{
+		# main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
+		# },);
 	}
 	else {
 		push(@rows,device_output());
@@ -7152,22 +7678,24 @@ sub get {
 
 sub device_output {
 	eval $start if $b_log;
-	my (@rows);
+	return if !$devices{'bluetooth'};
+	my ($bus_id,@rows);
 	my ($j,$num) = (0,1);
-	foreach my $row (@devices_bluetooth){
+	foreach my $row (@{$devices{'bluetooth'}}){
 		$num = 1;
+		$bus_id = '';
 		$j = scalar @rows;
 		my $driver = ($row->[9]) ? $row->[9] : 'N/A';
-		my $card = $row->[4];
-		$card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
+		my $device = $row->[4];
+		$device = ($device) ? main::pci_cleaner($device,'output') : 'N/A';
 		# have seen absurdly verbose card descriptions, with non related data etc
-		if (length($card) > 85 || $size{'max'} < 110){
-			$card = main::pci_long_filter($card);
+		if (length($device) > 85 || $size{'max'} < 110){
+			$device = main::pci_long_filter($device);
 		}
 		push(@rows, {
-		main::key($num++,1,1,'Device') => $card,
+		main::key($num++,1,1,'Device') => $device,
 		},);
-		if ($extra > 0 && $b_pci_tool && $row->[12]){
+		if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
 			my $item = main::get_pci_vendor($row->[4],$row->[12]);
 			$rows[$j]->{main::key($num++,0,2,'vendor')} = $item if $item;
 		}
@@ -7181,7 +7709,7 @@ sub device_output {
 			$rows[$j]->{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
 		}
 		if ($extra > 0){
-			$rows[$j]->{main::key($num++,0,2,'bus ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
 		}
 		if ($extra > 1){
 			my $chip_id = 'N/A';
@@ -7191,58 +7719,64 @@ sub device_output {
 			elsif ($row->[6]){
 				$chip_id = $row->[6];
 			}
-			$rows[$j]->{main::key($num++,0,2,'chip ID')} = $chip_id;
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $chip_id;
 			if ($extra > 2 && $row->[1]){
-				$rows[$j]->{main::key($num++,0,2,'class ID')} = $row->[1];
+				$rows[$j]->{main::key($num++,0,2,'class-ID')} = $row->[1];
 			}
 		}
-		push(@rows,advanced_output('pci',"$row->[2].$row->[3]")) if defined $row->[2] && defined $row->[3];
-		#print "$row->[0]\n";
+		# weird serial rpi bt
+		if ($use{'soc-bluetooth'}){
+			# /sys/devices/platform/soc/fe201000.serial/
+			$bus_id = "$row->[6].$row->[1]" if defined $row->[1] && defined $row->[6];
+		}
+		else {
+			# only theoretical, never seen one
+			$bus_id = "$row->[2].$row->[3]" if defined $row->[2] && defined $row->[3];
+		}
+		push(@rows,advanced_output('pci',$bus_id)) if $bus_id;
+		# print "$row->[0]\n";
 	}
 	eval $end if $b_log;
 	return @rows;
 }
 sub usb_output {
 	eval $start if $b_log;
-	return if !@usb;
-	my (@rows,$driver,$path_id,$product);
+	return if !$usb{'bluetooth'};
+	my (@rows,$path_id,$product);
 	my ($j,$num) = (0,1);
-	foreach my $row (@usb){
-		#print Data::Dumper::Dumper $row;
-		if ($row->[14] && $row->[14] eq 'Bluetooth'){
-			#print Data::Dumper::Dumper $row;
-			$num = 1;
-			$j = scalar @rows;
-			# makre sure to reset, or second device trips last flag
-			($driver,$path_id,$product) = ('','','');
-			$product = main::cleaner($row->[13]) if $row->[13];
-			$driver = ($row->[15]) ? $row->[15] : 'N/A';
-			$path_id = $row->[2] if $row->[2];
-# 			$product ||= 'N/A';
-			push(@rows, {
-			main::key($num++,1,1,'Device') => $product,
-			main::key($num++,0,2,'type') => 'USB',
-			main::key($num++,1,2,'driver') => $driver,
-			},);
-			if ($extra > 0 && $row->[15] && !$bsd_type){
-				my $version = main::get_module_version($row->[15]);
-				$rows[$j]->{main::key($num++,0,3,'v')} = $version if $version;
-			}
-			if ($extra > 0){
-				$rows[$j]->{main::key($num++,0,2,'bus ID')} = "$path_id:$row->[1]";
-			}
-			if ($extra > 1){
-				$row->[7] ||= 'N/A';
-				$rows[$j]->{main::key($num++,0,2,'chip ID')} = $row->[7];
-			}
-			if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
-				$rows[$j]->{main::key($num++,0,2,'class ID')} = "$row->[4]$row->[5]";
-			}
-			if ($extra > 2 && $row->[16]){
-				$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
-			}
-			push(@rows,advanced_output('usb',$path_id)) if $path_id;
+	foreach my $row (@{$usb{'bluetooth'}}){
+		# print Data::Dumper::Dumper $row;
+		$num = 1;
+		$j = scalar @rows;
+		# makre sure to reset, or second device trips last flag
+		($path_id,$product) = ('','');
+		$product = main::cleaner($row->[13]) if $row->[13];
+		$product ||= 'N/A';
+		$row->[15] ||= 'N/A';
+		$path_id = $row->[2] if $row->[2];
+		push(@rows, {
+		main::key($num++,1,1,'Device') => $product,
+		main::key($num++,0,2,'type') => 'USB',
+		main::key($num++,1,2,'driver') => $row->[15],
+		},);
+		if ($extra > 0 && $row->[15] && !$bsd_type){
+			my $version = main::get_module_version($row->[15]);
+			$rows[$j]->{main::key($num++,0,3,'v')} = $version if $version;
+		}
+		if ($extra > 0){
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+		}
+		if ($extra > 1){
+			$row->[7] ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $row->[7];
+		}
+		if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
 		}
+		if ($extra > 2 && $row->[16]){
+			$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
+		}
+		push(@rows,advanced_output('usb',$path_id)) if $path_id;
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -7250,51 +7784,114 @@ sub usb_output {
 sub advanced_output {
 	my ($type,$bus_id) = @_;
 	eval $start if $b_log;
-	my ($path,@rows,@temp);
-	my ($j,$num,$k,$l,$m,$id,$id2) = (0,1,2,3,4,'','');
-	hci_data() if !$b_hci && $alerts{'hciconfig'}->{'action'} eq 'use';
-	if ($type eq 'usb'){
-		$path = "/sys/bus/usb/devices/$bus_id:*/bluetooth";
+	my (@rows,@temp);
+	my ($j,$num,$k,$l,$m,$n,$address,$id,$note,$tool) = (0,1,2,3,4,5,'','','','');
+	if (!$b_hci && $alerts{'hciconfig'}->{'action'} eq 'use'){
+		hciconfig_data();
+		$tool = 'hciconfig';
+	}
+	elsif (!$b_hci && $alerts{'bt-adapter'}->{'action'} eq 'use'){
+		bt_tool_data();
+		$tool = 'bt-adapter';
 	}
-	elsif ($type eq 'pci') {
-		$path = "/sys/bus/pci/devices/0000:$bus_id/bluetooth";
+	if (!$b_rfk && -e '/sys/class/bluetooth/'){
+		rfkill_data();
+		$tool = 'rfkill' if !$tool;
 	}
+	# print "bid: $bus_id\n";
 	if ($type ne 'check'){
-		@temp = main::globber("$path/*") if $path;
+		@temp = main::globber('/sys/class/bluetooth/*');
+		@temp = map {$_ = Cwd::abs_path($_);$_} @temp if @temp;
+		# print Data::Dumper::Dumper \@temp;
+		@temp = grep {/$bus_id/} @temp if @temp;
 		@temp = map {$_ =~ s|^/.*/||;$_;} @temp if @temp;
+		# print Data::Dumper::Dumper \@temp;
 	}
 	elsif ($type eq 'check' && %hci){
 		@temp = keys %hci;
 		$id = '-ID';
-		($k,$l,$m) = (1,2,3);
+		($k,$l,$m,$n) = (1,2,3,4);
 	}
 	if (@temp && %hci){
+		if ($hci{'alert'}){
+			if (keys %hci == 1){
+				check_service(); # sets $service
+				$j = scalar @rows;
+				$rows[$j]->{main::key($num++,1,$k,'Report')} = $tool;
+				$rows[$j]->{main::key($num++,0,$l,'bt-service')} = $service;
+				$rows[$j]->{main::key($num++,0,$l,'note')} = $hci{'alert'};
+			}
+			else {
+				$note = $hci{'alert'};
+			}
+			delete $hci{'alert'};
+		}
 		foreach my $item (@temp){
 			if ($hci{$item}){
-				$id2 = $item if $id;
 				$j = scalar @rows;
 				push(@rows,{
-				main::key($num++,1,$k,'Report' . $id) => $id2,
+				main::key($num++,1,$k,'Report' . $id) => $tool,
 				},);
-				$rows[$j]->{main::key($num++,0,$l,'ID')} = $item if !$id;
-				$rows[$j]->{main::key($num++,0,$l,'state')} = $hci{$item}->{'state'};
-				if (my $btv = bluetooth_version($hci{$item}->{'lmp-version'})){
+				if ($note){
+					$rows[$j]->{main::key($num++,0,$l,'note')} = $note;
+				}
+				# synthesize for rfkill
+				if (!$hci{$item}->{'state'}){
+					$hci{$item}->{'state'} = ($b_bluetooth) ? 'up' : 'down';
+				}
+				$rows[$j]->{main::key($num++,0,$l,'ID')} = $item;
+				if (defined $hci{$item}->{'rf-index'} && 
+				 ($extra > 0 || $hci{$item}->{'state'} eq 'down')){
+					$rows[$j]->{main::key($num++,0,$m,'rfk-id')} = $hci{$item}->{'rf-index'};
+				}
+				$rows[$j]->{main::key($num++,1,$l,'state')} = $hci{$item}->{'state'};
+				# this only appears for hciconfig, bt-adapter does not run without bt service
+				if (!$b_bluetooth || $hci{$item}->{'state'} eq 'down'){
+					if (!$b_bluetooth || $hci{$item}->{'state'} eq 'down'){
+						check_service(); # sets $service
+						$rows[$j]->{main::key($num++,0,$m,'bt-service')} = $service;
+					}
+					if ($hci{$item}->{'hard-blocked'}){
+						$rows[$j]->{main::key($num++,1,$m,'rfk-block')} = '';
+						$rows[$j]->{main::key($num++,0,$n,'hardware')} = $hci{$item}->{'hard-blocked'};
+						$rows[$j]->{main::key($num++,0,$n,'software')} = $hci{$item}->{'soft-blocked'};
+					}
+				}
+				if (!$hci{$item}->{'address'} && $tool eq 'rfkill'){
+					$address = main::row_defaults('recommends');
+				}
+				else {
+					$address = main::apply_filter($hci{$item}->{'address'});
+				}
+				$rows[$j]->{main::key($num++,0,$l,'address')} = $address;
+				# lmp/hci version only hciconfig sadly
+				if (defined $hci{$item}->{'lmp-version'} && 
+				 (my $btv = bluetooth_version($hci{$item}->{'lmp-version'}))){
 					$rows[$j]->{main::key($num++,0,$l,'bt-v')} = $btv;
 				}
-				if ($extra > 0 && $hci{$item}->{'lmp-version'}){
+				if ($extra > 0 && defined $hci{$item}->{'lmp-version'}){
 					$rows[$j]->{main::key($num++,0,$l,'lmp-v')} = $hci{$item}->{'lmp-version'};
 					if ($extra > 1 && $hci{$item}->{'lmp-subversion'}){
 						$rows[$j]->{main::key($num++,0,$m,'sub-v')} = $hci{$item}->{'lmp-subversion'};
 					}
 				}
-				if ($extra > 0 && $hci{$item}->{'hci-version'} && ($extra > 2 || !$hci{$item}->{'lmp-version'} || 
+				if ($extra > 0 && defined $hci{$item}->{'hci-version'} && ($extra > 2 || !$hci{$item}->{'lmp-version'} || 
 				 ($hci{$item}->{'lmp-version'} && $hci{$item}->{'lmp-version'} ne $hci{$item}->{'hci-version'}))){
 					$rows[$j]->{main::key($num++,0,$l,'hci-v')} = $hci{$item}->{'hci-version'};
 					if ($extra > 1 && $hci{$item}->{'hci-revision'}){
 						$rows[$j]->{main::key($num++,0,$m,'rev')} = $hci{$item}->{'hci-revision'};
 					}
 				}
-				$rows[$j]->{main::key($num++,0,$l,'address')} = main::apply_filter($hci{$item}->{'address'});
+				# if ($extra > 1 && $hci{$item}->{'discoverable'}){
+				# 	$rows[$j]->{main::key($num++,1,$l,'discover')} = $hci{$item}->{'discoverable'};
+				# 	if ($extra > 2 && $hci{$item}->{'discovering'}){
+				# 		$rows[$j]->{main::key($num++,1,$m,'active')} = $hci{$item}->{'discovering'};
+				# 	}
+				# }
+				# if ($extra > 1 && $hci{$item}->{'pairable'}){
+				# 	$rows[$j]->{main::key($num++,0,$l,'pair')} = $hci{$item}->{'pairable'};
+				# }
+				# this data only from hciconfig
 				if ($b_admin && 
 				   ($hci{$item}->{'acl-mtu'} || $hci{$item}->{'sco-mtu'} || $hci{$item}->{'link-policy'})){
 					$j = scalar @rows;
@@ -7321,21 +7918,78 @@ sub advanced_output {
 			}
 		}
 	}
-	if ($alerts{'hciconfig'}->{'action'} ne 'use' && !$b_hci_error){
-		my $key = 'Message';
+	if (!@rows && !$b_hci_error && ($alerts{'hciconfig'}->{'action'} ne 'use' &&
+	  $alerts{'bt-adapter'}->{'action'} ne 'use')){
+		my $key = 'Report';
+		my $value = '';
+		if ($alerts{'hciconfig'}->{'action'} eq 'platform' || 
+		 $alerts{'bt-adapter'}->{'action'} eq 'platform'){
+			$value = main::row_defaults('tool-missing-os','bluetooth');
+		}
+		else {
+			$value = main::row_defaults('tools-missing','hciconfig/bt-adapter');
+		}
 		push(@rows,{
-		main::key($num++,0,1,$key) => $alerts{'hciconfig'}->{$alerts{'hciconfig'}->{'action'}},
+		main::key($num++,0,1,$key) => $value,
 		},);
 		$b_hci_error = 1;
 	}
 	eval $end if $b_log;
 	return @rows;
 }
-sub hci_data {
+
+sub bt_tool_data {
 	eval $start if $b_log;
 	$b_hci = 1;
 	my (@data,$id);
-	if ($b_fake_bluetooth){
+	if ($fake{'bluetooth'}){
+		my $file;
+		$file = "";
+		@data = main::reader($file,'strip');
+	}
+	else {
+		if ($b_bluetooth){
+			my $cmd = "$alerts{'bt-adapter'}->{'path'} --info 2>/dev/null";
+			@data = main::grabber($cmd,'', 'strip');
+		}
+	}
+	# print Data::Dumper::Dumper \@data;
+	main::log_data('dump','@data', \@data) if $b_log;
+	foreach (@data){
+		my @working = split(/:\s*/,$_);
+		# print Data::Dumper::Dumper \@working;
+		next if ! @working;
+		if ($working[0] =~ /^\[([^\]]+)\]/){
+			$id = $1;
+		}
+		elsif ($working[0] eq 'Address'){
+			$hci{$id}->{'address'} = join(':',@working[1 .. $#working]);
+		}
+		elsif ($working[0] eq 'Powered'){
+			$hci{$id}->{'state'} = ($working[1] =~ /^(1|yes)\b/) ? 'up': 'down';
+		}
+		elsif ($working[0] eq 'Discoverable'){
+			$hci{$id}->{'discoverable'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+		}
+		elsif ($working[0] eq 'Pairable'){
+			$hci{$id}->{'pairable'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+		}
+		elsif ($working[0] eq 'Discovering'){
+			$hci{$id}->{'discovering'} = ($working[1] =~ /^(1|yes)\b/) ? 'yes': 'no';
+		}
+	}
+	if (!@data && !$b_bluetooth){
+		$hci{'alert'} = main::row_defaults('bluetooth-down');
+	}
+	print Data::Dumper::Dumper \%hci if $dbg[27];
+	main::log_data('dump','%hci', \%hci) if $b_log;
+	eval $end if $b_log;
+}
+sub hciconfig_data {
+	eval $start if $b_log;
+	$b_hci = 1;
+	my (@data,$id);
+	if ($fake{'bluetooth'}){
 		my $file;
 		$file = "";
 		@data = main::reader($file,'strip');
@@ -7359,7 +8013,7 @@ sub hci_data {
 			$hci{$id}->{'acl-mtu'} = $2;
 			$hci{$id}->{'sco-mtu'} = $3;
 		}
-		elsif (/^(UP.*|DOWN.*)/){
+		elsif (/^(UP|DOWN).*/){
 			$hci{$id}->{'state'} = lc($1);
 		}
 		elsif (/^HCI Version:\s+([0-9\.]+)\s+.*Revision:\s+0x([0-9a-f]+)/){
@@ -7380,14 +8034,59 @@ sub hci_data {
 			$hci{$id}->{'service-classes'} = main::general_cleaner(lc($1));
 		}
 	}
-	# print Data::Dumper::Dumper \%hci;
+	print Data::Dumper::Dumper \%hci if $dbg[27];
+	main::log_data('dump','%hci', \%hci) if $b_log;
+	eval $end if $b_log;
+}
+sub rfkill_data {
+	eval $start if $b_log;
+	$b_rfk = 1;
+	my (@data,$id,$value);
+	if ($fake{'bluetooth'}){
+		my $file;
+		$file = "";
+		@data = main::reader($file,'strip');
+	}
+	else {
+		# /state is the state of rfkill, NOT bluetooth!
+		@data = main::globber('/sys/class/bluetooth/hci*/rfkill*/{hard,index,soft}');
+	}
+	# print Data::Dumper::Dumper \@data;
+	main::log_data('dump','@data', \@data) if $b_log;
+	foreach (@data){
+		$id = (split(/\//,$_))[4];
+		if (m|/soft$|){
+			$value = main::reader($_,'strip',0);
+			$hci{$id}->{'soft-blocked'} = ($value) ? 'yes': 'no';
+			$hci{$id}->{'state'} = 'down' if $hci{$id}->{'soft-blocked'} eq 'yes';
+		}
+		elsif (m|/hard$|){
+			$value = main::reader($_,'strip',0);
+			$hci{$id}->{'hard-blocked'} = ($value) ? 'yes': 'no';
+			$hci{$id}->{'state'} = 'down' if $hci{$id}->{'hard-blocked'} eq 'yes';
+		}
+		elsif (m|/index$|){
+			$value = main::reader($_,'strip',0);
+			$hci{$id}->{'rf-index'} = $value;
+		}
+	}
+	print Data::Dumper::Dumper \%hci if $dbg[27];
 	main::log_data('dump','%hci', \%hci) if $b_log;
 	eval $end if $b_log;
 }
+sub check_service {
+	eval $start if $b_log;
+	if (!$b_service){
+		$service = ServiceData::get('status','bluetooth');
+		$service ||= 'N/A';
+		$b_service = 1;
+	}
+	eval $end if $b_log;
+}
 sub bluetooth_version {
 	eval $start if $b_log;
 	my ($lmp) = @_;
-	return if !main::is_numeric($lmp);
+	return if !defined $lmp || !main::is_numeric($lmp);
 	$lmp = int($lmp);
 	# conveniently, LMP starts with 0, so perfect for array indexes
 	my @bt = qw(1.0b 1.1 1.2 2.0 2.1 3.0 4.0 4.1 4.2 5.0 5.1 5.2);
@@ -7396,9 +8095,9 @@ sub bluetooth_version {
 }
 }
 
-## CpuData
+## CpuItem
 {
-package CpuData;
+package CpuItem;
 
 sub get {
 	eval $start if $b_log;
@@ -7422,19 +8121,20 @@ sub full_output {
 	my $num = 0;
 	my ($b_flags,$b_speeds,$core_speeds_value,$flag_key,@flags,%cpu,@rows);
 	my $sleep = $cpu_sleep * 1000000;
-	if ($b_hires){
-		eval 'Time::HiRes::usleep( $sleep )';
-	}
-	else {
-		select(undef, undef, undef, $cpu_sleep);
-	}
-	if (my $file = main::system_files('cpuinfo')){
+	if (my $file = $system_files{'proc-cpuinfo'}){
+		# bsd sleep is set before sysctl runs, same idea
+		if ($b_hires){
+			eval 'Time::HiRes::usleep($sleep)';
+		}
+		else {
+			select(undef, undef, undef, $cpu_sleep);
+		}
 		%cpu = cpuinfo_data($file,'full');
 	}
-	elsif ($bsd_type ){
+	elsif ($bsd_type){
 		my ($key1,$val1) = ('','');
-		if ( $alerts{'sysctl'} ){
-			if ( $alerts{'sysctl'}->{'action'} eq 'use' ){
+		if ($alerts{'sysctl'}){
+			if ($alerts{'sysctl'}->{'action'} eq 'use'){
 # 				$key1 = 'Status';
 # 				$val1 = main::row_defaults('dev');
 				%cpu = sysctl_data('full');
@@ -7460,7 +8160,7 @@ sub full_output {
 	if ($cpu{'system-cpus'}){
 		my %system_cpus = %{$cpu{'system-cpus'}};
 		my $i = 1;
-		my $counter = ( %system_cpus && scalar keys %system_cpus > 1 ) ? '-' : '';
+		my $counter = (%system_cpus && scalar keys %system_cpus > 1) ? '-' : '';
 		foreach my $key (keys %system_cpus){
 			$counter = '-' . $i++ if $counter;
 			$rows[$j]->{main::key($num++,0,2,'variant'.$counter)} = $key;
@@ -7487,7 +8187,7 @@ sub full_output {
 			$rows[$j]->{main::key($num++,0,3,'note')} = $cpu{'arch-note'};
 		}
 		# ntoe: had if arch, but stepping can be defined where arch failed, stepping can be 0
-		if ( !$b_admin && defined $cpu{'stepping'} ){
+		if (!$b_admin && defined $cpu{'stepping'}){
 			$rows[$j]->{main::key($num++,0,2,'rev')} = $cpu{'stepping'};
 		}
 	}
@@ -7500,15 +8200,21 @@ sub full_output {
 			$rows[$j]->{main::key($num++,0,2,'microcode')} = $cpu{'microcode'};
 		}
 	}
-	if ($extra > 1 && $properties{'l1-cache'}){
-		$rows[$j]->{main::key($num++,0,2,'L1 cache')} = main::get_size($properties{'l1-cache'},'string');
-	}
-	if (!$b_arm || ($b_arm && $properties{'l2-cache'})){
+	if (($extra > 1 && ($properties{'l1-cache'} || $properties{'l3-cache'})) || 
+	 ((!$b_arm && !$b_mips && !$b_ppc) || $properties{'l2-cache'})){
+		$rows[$j]->{main::key($num++,1,2,'cache')} = '';
+		if ($extra > 1 && $properties{'l1-cache'}){
+			$rows[$j]->{main::key($num++,0,3,'L1')} = main::get_size($properties{'l1-cache'},'string');
+		}
+		# the arm + l2 will never be true since arm cpus don't have l2 cache
 		$properties{'l2-cache'} = ($properties{'l2-cache'}) ? main::get_size($properties{'l2-cache'},'string') : 'N/A';
-		$rows[$j]->{main::key($num++,0,2,'L2 cache')} = $properties{'l2-cache'};
-	}
-	if ($extra > 1 && $properties{'l3-cache'}){
-		$rows[$j]->{main::key($num++,0,2,'L3 cache')} = main::get_size($properties{'l3-cache'},'string');
+		$rows[$j]->{main::key($num++,0,3,'L2')} = $properties{'l2-cache'};
+		if ($extra > 1 && $properties{'l3-cache'}){
+			$rows[$j]->{main::key($num++,0,3,'L3')} = main::get_size($properties{'l3-cache'},'string');
+		}
+		if ($properties{'cache-check'}){
+			$rows[$j]->{main::key($num++,0,3,'note')} = $properties{'cache-check'};
+		}
 	}
 	if ($extra > 0 && !$show{'cpu-flag'}){
 		$j = scalar @rows;
@@ -7547,7 +8253,7 @@ sub full_output {
 			$b_speeds = 1;
 		}
 		else {
-			$core_speeds_value = main::row_defaults('cpu-speeds',scalar @speeds);
+			$core_speeds_value = main::row_defaults('cpu-speeds');
 		}
 	}
 	else {
@@ -7597,7 +8303,7 @@ sub full_output {
 		my @bugs = cpu_bugs_sys();
 		my $value = '';
 		if (!@bugs){
-			if ( $cpu{'bugs'}){
+			if ($cpu{'bugs'}){
 				my @proc_bugs = split(/\s+/, $cpu{'bugs'});
 				@proc_bugs = sort @proc_bugs;
 				$value = join(' ', @proc_bugs);
@@ -7651,22 +8357,22 @@ sub short_data {
 	my $num = 0;
 	my (%cpu,@data,%speeds);
 	my $sys = '/sys/devices/system/cpu/cpufreq/policy0';
-	my $sleep = $cpu_sleep * 1000000;
-	if ($b_hires){
-		eval 'Time::HiRes::usleep( $sleep )';
-	}
-	else {
-		select(undef, undef, undef, $cpu_sleep);
-	}
 	# NOTE: : Permission denied, ie, this is not always readable
 	# /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_cur_freq
-	if (my $file = main::system_files('cpuinfo')){
+	if (my $file = $system_files{'proc-cpuinfo'}){
+		my $sleep = $cpu_sleep * 1000000;
+		if ($b_hires){
+			eval 'Time::HiRes::usleep($sleep)';
+		}
+		else {
+			select(undef, undef, undef, $cpu_sleep);
+		}
 		%cpu = cpuinfo_data($file,$type);
 	}
-	elsif ($bsd_type ){
+	elsif ($bsd_type){
 		my ($key1,$val1) = ('','');
-		if ( $alerts{'sysctl'} ){
-			if ( $alerts{'sysctl'}->{'action'} eq 'use' ){
+		if ($alerts{'sysctl'}){
+			if ($alerts{'sysctl'}->{'action'} eq 'use'){
 # 				$key1 = 'Status';
 # 				$val1 = main::row_defaults('dev');
 				%cpu = sysctl_data($type);
@@ -7720,8 +8426,7 @@ sub cpuinfo_data {
 	my %cpu =  set_cpu_data();
 	$cpu{'type'} = cpu_vendor($cpu_arch) if $cpu_arch =~ /e2k/; # already set to lower
 	# use --arm flag when testing arm cpus, and --fake-cpu to trigger fake data
-	if ($b_fake_cpu){
-		# $cpu{'type'} = 'elbrus'; # uncomment to test elbrus
+	if ($fake{'cpu'}){
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-4-core-pinebook-1.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/armv6-single-core-1.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/armv7-dual-core-1.txt";
@@ -7745,6 +8450,8 @@ sub cpuinfo_data {
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/intel/4-6-core-xeon-no-mt-lathander.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/mips/mips-mainusg-cpuinfo.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/ppc/ppc-debian-ppc64-cpuinfo.txt";
+		# $cpu{'type'} = 'elbrus'; # uncomment to test elbrus
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/elbrus-2c3/cpuinfo.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE1C-8.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE2CDSP-4.txt";
 		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/elbrus/1xE2S4-3-monocub.txt";
@@ -7769,7 +8476,7 @@ sub cpuinfo_data {
 		$starter = $line[0]; # preserve case for one specific ARM issue
 		$line[0] = lc($line[0]);
 		if ($b_arm && !$b_first && $starter eq 'Processor' && $line[1] !~ /^\d+$/){
-			#print "l1:$line[1]\n";
+			# print "l1:$line[1]\n";
 			$cpu{'model_name'} = main::cleaner($line[1]);
 			$cpu{'model_name'} = cpu_cleaner($cpu{'model_name'});
 			$cpu{'type'} = 'arm';
@@ -7785,7 +8492,7 @@ sub cpuinfo_data {
 				$cpu{'processors'}->[$proc_count] = 0;
 				$b_proc_int = 0;
 				$b_first = 1;
-				#print "p0:\n";
+				# print "p0:\n";
 			}
 		}
 		elsif ($line[0] eq 'processor'){
@@ -7795,40 +8502,42 @@ sub cpuinfo_data {
 				$b_first = 1;
 				$cpu{'processors'}->[$proc_count] = 0;
 				$proc_count++;
-				#print "p1: $proc_count\n";
+				# print "p1: $proc_count\n";
 			}
 			else {
 				if (!$b_proc_int){
 					$cpu{'processors'}->[$proc_count] = 0;
 					$proc_count++;
-					#print "p2a: $proc_count\n";
+					# print "p2a: $proc_count\n";
 				}
-				if (!$b_first ){
+				if (!$b_first){
 					# note: alternate: 
 					# Processor	: AArch64 Processor rev 4 (aarch64)
 					# but no model name type
-					if ( $b_arm || $line[1] =~ /ARM|AArch/i){
+					if ($b_arm || $line[1] =~ /ARM|AArch/i){
 						$b_arm = 1;
 						$cpu{'type'} = 'arm';
 					}
 					$cpu{'model_name'} = main::cleaner($line[1]);
 					$cpu{'model_name'} = cpu_cleaner($cpu{'model'});
-					#print "p2b:\n";
+					# print "p2b:\n";
 				}
 				$b_first = 1;
 			}
 		}
 		elsif (!$cpu{'family'} && 
-		       ($line[0] eq 'architecture' || $line[0] eq 'cpu family' || $line[0] eq 'cpu architecture' )){
+		 ($line[0] eq 'architecture' || $line[0] eq 'cpu family' || 
+		 $line[0] eq 'cpu architecture')){
 			if ($line[1] =~ /^\d+$/){
 				# translate integers to hex
 				$cpu{'family'} = uc(sprintf("%x", $line[1]));
 			}
-			elsif ($b_arm) {
+			elsif ($b_arm){
 				$cpu{'arch'} = $line[1];
 			}
 		}
-		elsif (!defined $cpu{'stepping'} && ($line[0] eq 'stepping' || $line[0] eq 'cpu revision')){
+		elsif (!defined $cpu{'stepping'} && ($line[0] eq 'stepping' || 
+		 $line[0] eq 'cpu revision')){
 			$cpu{'stepping'} = uc(sprintf("%x", $line[1]));
 		}
 		# ppc
@@ -7836,21 +8545,23 @@ sub cpuinfo_data {
 			$cpu{'stepping'} = $line[1];
 		}
 		# this is hex so uc for cpu arch id. raspi 4 has Model rather than Hard
-		elsif (!$cpu{'model_id'} && (!$b_ppc && !$b_arm && $line[0] eq 'model') ){
+		elsif (!$cpu{'model_id'} && (!$b_ppc && !$b_arm && $line[0] eq 'model')){
 			$cpu{'model_id'} = uc(sprintf("%x", $line[1]));
 		}
-		elsif (!$cpu{'model_id'} && $line[0] eq 'cpu variant' ){
+		elsif (!$cpu{'model_id'} && $line[0] eq 'cpu variant'){
 			$cpu{'model_id'} = uc($line[1]);
 			$cpu{'model_id'} =~ s/^0X//;
 		}
 		# cpu can show in arm
-		elsif (!$cpu{'model_name'} && ( $line[0] eq 'model name' || $line[0] eq 'cpu' || $line[0] eq 'cpu model' )){
+		elsif (!$cpu{'model_name'} && ($line[0] eq 'model name' || 
+		 $line[0] eq 'cpu' || $line[0] eq 'cpu model')){
 			$cpu{'model_name'} = main::cleaner($line[1]);
 			$cpu{'model_name'} = cpu_cleaner($cpu{'model_name'});
-			if ( $b_arm || $line[1] =~ /ARM|AArch/i){
+			if ($b_arm || $line[1] =~ /ARM|AArch/i){
 				$b_arm = 1;
 				$cpu{'type'} = 'arm';
-				if ($cpu{'model_name'} && $cpu{'model_name'} =~ /(.*)\srev\s([\S]+)\s(\(([\S]+)\))?/){
+				if ($cpu{'model_name'} && 
+				 $cpu{'model_name'} =~ /(.*)\srev\s([\S]+)\s(\(([\S]+)\))?/){
 					$cpu{'model_name'} = $1;
 					$cpu{'stepping'} = $2;
 					if ($4){
@@ -7865,109 +8576,107 @@ sub cpuinfo_data {
 				$cpu{'type'} = 'mips';
 			}
 		}
-		elsif ( $line[0] eq 'cpu mhz' || $line[0] eq 'clock' ){
+		elsif ($line[0] eq 'cpu mhz' || $line[0] eq 'clock'){
 			$speed = speed_cleaner($line[1]);
 			$cpu{'processors'}->[$proc_count-1] = $speed;
-			#$ids[$phys_id]->[$die_id] = ([($speed)]);
+			#$ids[$phys_id]->[$die_id] = [$speed];
 		}
-		elsif (!$cpu{'siblings'} && $line[0] eq 'siblings' ){
+		elsif (!$cpu{'siblings'} && $line[0] eq 'siblings'){
 			$cpu{'siblings'} = $line[1];
 		}
-		elsif (!$cpu{'cores'} && $line[0] eq 'cpu cores' ){
+		elsif (!$cpu{'cores'} && $line[0] eq 'cpu cores'){
 			$cpu{'cores'} = $line[1];
 		}
 		# increment by 1 for every new physical id we see. These are in almost all cases
 		# separate cpus, not separate dies within a single cpu body.
-		elsif ( $line[0] eq 'physical id' ){
-			if ( !defined $phys_holder || $phys_holder != $line[1] ){
+		elsif ($line[0] eq 'physical id'){
+			if (!defined $phys_holder || $phys_holder != $line[1]){
 				# only increment if not in array counter
 				push(@phys_cpus, $line[1]) if ! grep {/$line[1]/} @phys_cpus;
 				$phys_holder = $line[1];
-				#print "pid: $line[1] ph: $phys_holder did: $die_id\n";
+				# print "pid: $line[1] ph: $phys_holder did: $die_id\n";
 				$die_id = 0;
 				#$die_holder = 0;
 			}
 		}
-		elsif ( $line[0] eq 'core id' ){
-			#print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
+		elsif ($line[0] eq 'core id'){
+			# print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
 			# https://www.pcworld.com/article/3214635/components-processors/ryzen-threadripper-review-we-test-amds-monster-cpu.html
-			if ($line[1] > 0 ){
+			if ($line[1] > 0){
 				$die_holder = $line[1];
 				$core_count++;
 			}
 			# NOTE: this logic won't work for die detections, unforutnately.
 			# ARM uses a different /sys based method, and ryzen relies on math on the cores
 			# in process_data
-			elsif ($line[1] == 0 && $die_holder > 0 ){
+			elsif ($line[1] == 0 && $die_holder > 0){
 				$die_holder = $line[1];
 				$core_count = 0;
-				$die_id++ if ($cpu{'type'} ne 'intel' && $cpu{'type'} ne 'amd' );
+				$die_id++ if ($cpu{'type'} ne 'intel' && $cpu{'type'} ne 'amd');
 			}
 			$phys_holder = 0 if ! defined $phys_holder;
 			$ids[$phys_holder]->[$die_id][$line[1]] = $speed;
-			#print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
+			# print "ph: $phys_holder did: $die_id l1: $line[1] s: $speed\n";
 		}
-		if (!$cpu{'type'} && $line[0] eq 'vendor_id' ){
+		if (!$cpu{'type'} && $line[0] eq 'vendor_id'){
 			$cpu{'type'} = cpu_vendor($line[1]);
 		}
 		## this is only for -C full cpu output
-		if ( $type eq 'full' ){
-			if (!$cpu{'l2-cache'} && ($line[0] eq 'cache size' || $line[0] eq 'l2 cache size' )){
-				if ($line[1] =~ /(\d+)\s(K|M)B$/){
-					$cpu{'l2-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
+		if ($type eq 'full'){
+			if (!$cpu{'l2-cache'} && ($line[0] eq 'cache size' || $line[0] eq 'l2 cache size')){
+				if ($line[1] =~ /(\d+\s*[KMG])i?B?$/){
+					$cpu{'l2-cache'} = main::translate_size($1);
 				}
 			}
 			elsif (!$cpu{'l1-cache'} && $line[0] eq 'l1 cache size'){
-				if ($line[1] =~ /(\d+)\sKB$/){
-					$cpu{'l1-cache'} = $1;
+				if ($line[1] =~ /(\d+\s*[KMG])i?B?$/){
+					$cpu{'l1-cache'} = main::translate_size($1);
 				}
 			}
 			elsif (!$cpu{'l3-cache'} && $line[0] eq 'l3 cache size'){
-				if ($line[1] =~ /(\d+)\s(K|M)B$/){
-					$cpu{'l2-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
+				if ($line[1] =~ /(\d+\s*[KMG])i?B?$/){
+					$cpu{'l3-cache'} = main::translate_size($1);
 				}
 			}
 			if ($cpu{'type'} eq 'elbrus'){
 				# note: cache0 is L1i and cache1 L1d, but add both for L1
 				if (!$cpu{'l0-cache'} && $line[0] eq 'cache0'){
-					if ($line[1] =~ /size=(\d+)K\s/){
+					if ($line[1] =~ /size\s*=\s*(\d+)K\s/){
 						$cpu{'l0-cache'} = $1;
 					}
 				}
 				elsif (!$cpu{'l1-cache'} && $line[0] eq 'cache1'){
-					if ($line[1] =~ /size=(\d+)K\s/){
+					if ($line[1] =~ /size\s*=\s*(\d+)K\s/){
 						$cpu{'l1-cache'} = $1;
 						$cpu{'l1-cache'} += $cpu{'l0-cache'} if $cpu{'l0-cache'};
 					}
 				}
 				elsif (!$cpu{'l2-cache'} && $line[0] eq 'cache2'){
-					if ($line[1] =~ /size=(\d+)(K|M)\s/){
+					if ($line[1] =~ /size\s*=\s*(\d+)(K|M)\s/){
 						$cpu{'l2-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
 					}
 				}
 				elsif (!$cpu{'l3-cache'} && $line[0] eq 'cache3'){
-					if ($line[1] =~ /size=(\d+)(K|M)\s/){
+					if ($line[1] =~ /size\s*=\s*(\d+)(K|M)\s/){
 						$cpu{'l3-cache'} = ($2 eq 'M') ? ($1*1024) : $1;
 					}
 				}
 			}
-			if (!$cpu{'flags'} && ($line[0] eq 'flags' || $line[0] eq 'features' )){
+			if (!$cpu{'flags'} && ($line[0] eq 'flags' || $line[0] eq 'features')){
 				$cpu{'flags'} = $line[1];
 			}
-		}
-		if ( $extra > 0 && $type eq 'full' ){
-			if ($line[0] eq 'bogomips'){
+			if ($extra > 0 && $line[0] eq 'bogomips'){
 				# new arm shows bad bogomip value, so don't use it
 				$cpu{'bogomips'} += $line[1] if $line[1] > 50;
 			}
 		}
-		if ($b_admin ){
+		if ($b_admin){
 			# note: not used unless maybe /sys data missing?
-			if ( !$cpu{'bugs'} && $line[0] eq 'bugs'){
+			if (!$cpu{'bugs'} && $line[0] eq 'bugs'){
 				$cpu{'bugs'} = $line[1];
 			}
 			# unlike family and model id, microcode appears to be hex already
-			if ( !$cpu{'microcode'} && $line[0] eq 'microcode'){
+			if (!$cpu{'microcode'} && $line[0] eq 'microcode'){
 				if ($line[1] =~ /0x/){
 					$cpu{'microcode'} = uc($line[1]);
 					$cpu{'microcode'} =~ s/^0X//;
@@ -7993,11 +8702,11 @@ sub cpuinfo_data {
 		}
 	}
 	$cpu{'ids'} = (\@ids);
-	if ( $extra > 0 && !$cpu{'arch'} && $type ne 'short' ){
+	if ($extra > 0 && !$cpu{'arch'} && $type ne 'short'){
 		($cpu{'arch'},$cpu{'arch-note'}) = cpu_arch($cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'stepping'});
 		# cpu_arch comes from set_os()
 		$cpu{'arch'} = $cpu_arch if (!$cpu{'arch'} && $cpu_arch && ($b_mips || $b_arm || $b_ppc));
-		#print "$cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'arch'}\n";
+		# print "$cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'arch'}\n";
 	}
 	if (!$speeds{'cur-freq'}){
 		$cpu{'cur-freq'} = $cpu{'processors'}->[0];
@@ -8010,7 +8719,7 @@ sub cpuinfo_data {
 		$cpu{'max-freq'} = $speeds{'max-freq'};
 	}
 	main::log_data('dump','%cpu',\%cpu) if $b_log;
-	print Data::Dumper::Dumper \%cpu if $test[8];
+	print Data::Dumper::Dumper \%cpu if $dbg[8];
 	eval $end if $b_log;
 	return %cpu;
 }
@@ -8022,90 +8731,110 @@ sub sysctl_data {
 	my (@ids,@line,%speeds,@working);
 	my ($sep) = ('');
 	my ($die_holder,$die_id,$phys_holder,$phys_id,$proc_count,$speed) = (0,0,0,0,0,0,0);
-	foreach (@sysctl){
+	@{$sysctl{'cpu'}} = () if !$sysctl{'cpu'}; # don't want error next!
+	foreach (@{$sysctl{'cpu'}}){
 		@line = split(/\s*:\s*/, $_);
-		next if ! $line[0];
+		next if !$line[0];
 		# darwin shows machine, like MacBook7,1, not cpu
 		# machdep.cpu.brand_string: Intel(R) Core(TM)2 Duo CPU     P8600  @ 2.40GHz
-		if ( ($bsd_type ne 'darwin' && $line[0] eq 'hw.model' ) || 
-		      $line[0] eq 'machdep.cpu.brand_string' ){
+		if (($bsd_type ne 'darwin' && $line[0] eq 'hw.model') || 
+		      $line[0] eq 'machdep.cpu.brand_string'){
 			# cut L2 cache/cpu max speed out of model string, if available
 			# openbsd 5.6: AMD Sempron(tm) Processor 3400+ ("AuthenticAMD" 686-class, 256KB L2 cache)
+			# openbsd 6.x has Lx cache data in dmesg.boot
 			# freebsd 10: hw.model: AMD Athlon(tm) II X2 245 Processor
 			$line[1] = main::cleaner($line[1]);
 			$line[1] = cpu_cleaner($line[1]);
-			if ( $line[1] =~ /([0-9]+)[-[:space:]]*([KM]B)\s+L2 cache/) {
+			if ($line[1] =~ /([0-9]+)[\s-]*([KM]B)\s+L2 cache/i){
 				my $multiplier = ($2 eq 'MB') ? 1024: 1;
 				$cpu{'l2-cache'} = $1 * $multiplier;
 			}
-			if ( $line[1] =~ /([^0-9\.][0-9\.]+)[-[:space:]]*[MG]Hz/) {
+			if ($line[1] =~ /([^0-9\.][0-9\.]+)[\s-]*[MG]Hz/){
 				$cpu{'max-freq'} = $1;
-				if ($cpu{'max-freq'} =~ /MHz/i) {
-					$cpu{'max-freq'} =~ s/[-[:space:]]*MHz//;
+				if ($cpu{'max-freq'} =~ /MHz/i){
+					$cpu{'max-freq'} =~ s/[\s-]*MHz//;
 					$cpu{'max-freq'} = speed_cleaner($cpu{'max-freq'},'mhz');
 				}
-				elsif ($cpu{'max-freq'} =~ /GHz/) {
-					$cpu{'max-freq'} =~ s/[-[:space:]]*GHz//i;
+				elsif ($cpu{'max-freq'} =~ /GHz/){
+					$cpu{'max-freq'} =~ s/[\s-]*GHz//i;
 					$cpu{'max-freq'} = $cpu{'max-freq'} / 1000;
 					$cpu{'max-freq'} = speed_cleaner($cpu{'max-freq'},'mhz');
 				}
 			}
-			if ( $line[1] =~ /\)$/ ){
+			if ($line[1] =~ /\)$/){
 				$line[1] =~ s/\s*\(.*\)$//;
 			}
 			$cpu{'model_name'} = $line[1];
 			$cpu{'type'} = cpu_vendor($line[1]);
 		}
-		# NOTE: hw.l1icachesize: hw.l1dcachesize:
-		elsif ($line[0] eq 'hw.l1icachesize') {
+		# NOTE: hw.l1icachesize: hw.l1dcachesize: ; in bytes, apparently
+		elsif ($line[0] eq 'hw.l1icachesize'){
 			$cpu{'l1-cache'} = $line[1]/1024;
 		}
-		elsif ($line[0] eq 'hw.l2cachesize') {
+		elsif ($line[0] eq 'hw.l2cachesize'){
 			$cpu{'l2-cache'} = $line[1]/1024;
 		}
-		elsif ($line[0] eq 'hw.l3cachesize') {
+		elsif ($line[0] eq 'hw.l3cachesize'){
 			$cpu{'l3-cache'} = $line[1]/1024;
 		}
 		# this is in mghz in samples
-		elsif ($line[0] eq 'hw.clockrate' || $line[0] eq 'hw.cpuspeed') {
+		elsif (!$cpu{'cur-freq'} && 
+		 ($line[0] eq 'hw.clockrate' || $line[0] eq 'hw.cpuspeed')){
 			$cpu{'cur-freq'} = $line[1];
 		}
 		# these are in hz: 2400000000
-		elsif ($line[0] eq 'hw.cpufrequency') {
+		elsif ($line[0] eq 'hw.cpufrequency'){
 			$cpu{'cur-freq'} = $line[1]/1000000;
 		}
-		elsif ($line[0] eq 'hw.busfrequency_min') {
+		elsif ($line[0] eq 'hw.busfrequency_min'){
 			$cpu{'min-freq'} = $line[1]/1000000;
 		}
-		elsif ($line[0] eq 'hw.busfrequency_max') {
+		elsif ($line[0] eq 'hw.busfrequency_max'){
 			$cpu{'max-freq'} = $line[1]/1000000;
 		}
-		elsif ($line[0] eq 'machdep.cpu.vendor') {
+		# FB seems to call freq something other than clock speed, unreliable 
+		# eg: 1500 Mhz real shows as 2400 freq, which is wrong
+		# elsif ($line[0] =~ /^dev\.cpu\.([0-9]+)\.freq$/){
+		#	 $speed = speed_cleaner($line[1]);
+		#	 $cpu{'processors'}->[$1] = $speed;
+		# }
+		# weird FB thing, freq can be wrong, so just count the cores and call it 
+		# done.
+		elsif ($line[0] =~ /^dev\.cpu\.([0-9]+)\./ && 
+			(!$cpu{'processors'} || !defined $cpu{'processors'}->[$1])){
+			$cpu{'processors'}->[$1] = undef;
+		}
+		elsif ($line[0] eq 'machdep.cpu.vendor'){
 			$cpu{'type'} = cpu_vendor($line[1]);
 		}
 		# darwin only?
-		elsif ($line[0] eq 'machdep.cpu.features') {
+		elsif ($line[0] eq 'machdep.cpu.features'){
 			$cpu{'flags'} = lc($line[1]);
 		}
-		elsif ($line[0] eq 'hw.ncpu' ) {
+		elsif ($line[0] eq 'hw.ncpu'){
 			$cpu{'cores'} = $line[1];
 		}
-		# Freebsd does some voltage hacking to actually run at lowest listed frequencies.
-		# The cpu does not actually support all the speeds output here but works in freebsd. 
-		elsif ($line[0] eq 'dev.cpu.0.freq_levels') {
+		# Freebsd does some voltage hacking to actually run at lowest listed 
+		# frequencies. The cpu does not actually support all the speeds output 
+		# here but works in freebsd. Disabled this, the freq appear to refer to 
+		# something else, not cpu clock. Remove XXX to enable
+		elsif ($line[0] eq 'dev.cpu.0.freq_levelsXXX'){
 			$line[1] =~ s/^\s+|\/[0-9]+|\s+$//g;
-			if ( $line[1] =~ /[0-9]+\s+[0-9]+/ ) {
+			if ($line[1] =~ /[0-9]+\s+[0-9]+/){
+				# get rid of -1 in FB: 2400/-1 2200/-1 2000/-1 1800/-1
+				$line[1] =~ s|/-1||g;
 				my @temp = split(/\s+/, $line[1]);
 				$cpu{'max-freq'} = $temp[0];
 				$cpu{'min-freq'} = $temp[-1];
 				$cpu{'scalings'} = \@temp;
 			}
 		}
-		elsif (!$cpu{'cur-freq'} && $line[0] eq 'dev.cpu.0.freq' ) {
+		# Disabled w/XXX. this is almost certainly bad data, should not be used
+		elsif (!$cpu{'cur-freq'} && $line[0] eq 'dev.cpu.0.freqXXX'){
 			$cpu{'cur-freq'} = $line[1];
 		}
 		# the following have only been seen in DragonflyBSD data but thumbs up!
-		elsif ($line[0] eq 'hw.cpu_topology.members' ) {
+		elsif ($line[0] eq 'hw.cpu_topology.members'){
 			my @temp = split(/\s+/, $line[1]);
 			my $count = scalar @temp;
 			$count-- if $count > 0;
@@ -8115,27 +8844,27 @@ sub sysctl_data {
 				$cpu{'processors'}->[$_] = 0;
 			}
 		}
-		elsif ($line[0] eq 'hw.cpu_topology.cpu1.physical_siblings' ) {
+		elsif ($line[0] eq 'hw.cpu_topology.cpu1.physical_siblings'){
 			# string, like: cpu0 cpu1
 			my @temp = split(/\s+/, $line[1]);
 			$cpu{'siblings'} = scalar @temp;
 		}
 		# increment by 1 for every new physical id we see. These are in almost all cases
 		# separate cpus, not separate dies within a single cpu body.
-		elsif ( $line[0] eq 'hw.cpu_topology.cpu0.physical_id' ){
-			if ($phys_holder != $line[1] ){
+		elsif ($line[0] eq 'hw.cpu_topology.cpu0.physical_id'){
+			if ($phys_holder != $line[1]){
 				$phys_id++;
 				$phys_holder = $line[1];
-				$ids[$phys_id] = ([(0)]);
-				$ids[$phys_id]->[$die_id] = ([(0)]);
+				$ids[$phys_id] = [0];
+				$ids[$phys_id]->[$die_id] = [0];
 			}
 		}
-		elsif ( $line[0] eq 'hw.cpu_topology.cpu0.core_id' ){
-			if ($line[1] > 0 ){
+		elsif ($line[0] eq 'hw.cpu_topology.cpu0.core_id'){
+			if ($line[1] > 0){
 				$die_holder = $line[1];
 			}
 			# this handles multi die cpus like 16 core ryzen
-			elsif ($line[1] == 0 && $die_holder > 0 ){
+			elsif ($line[1] == 0 && $die_holder > 0){
 				$die_id++ ;
 				$die_holder = $line[1];
 			}
@@ -8143,28 +8872,256 @@ sub sysctl_data {
 			$cpu{'dies'} = $die_id;
 		}
 	}
-	if (!$cpu{'flags'}){
-		$cpu{'flags'} = cpu_flags_bsd();
+	if (!$cpu{'flags'} || !$cpu{'family'}){
+		my %dmesg_boot = dboot_data();
+		 # this core count may fix failed MT detection.
+		$cpu{'cores'} = $dmesg_boot{'cores'} if $dmesg_boot{'cores'};
+		$cpu{'flags'} = $dmesg_boot{'flags'} if !$cpu{'flags'};
+		$cpu{'family'} = $dmesg_boot{'family'} if !$cpu{'family'};
+		$cpu{'l1-cache'} = $dmesg_boot{'l1-cache'} if !$cpu{'l1-cache'};
+		$cpu{'l2-cache'} = $dmesg_boot{'l2-cache'} if !$cpu{'l2-cache'};
+		$cpu{'l3-cache'} = $dmesg_boot{'l3-cache'} if !$cpu{'l3-cache'};
+		$cpu{'microcode'} = $dmesg_boot{'microcode'} if !$cpu{'microcode'};
+		$cpu{'model_id'} = $dmesg_boot{'model_id'} if !$cpu{'model_id'};
+		$cpu{'max-freq'} = $dmesg_boot{'max-freq'} if !$cpu{'max-freq'};
+		$cpu{'min-freq'} = $dmesg_boot{'min-freq'} if !$cpu{'min-freq'};
+		$cpu{'scalings'} = $dmesg_boot{'scalings'} if !$cpu{'scalings'};
+		$cpu{'siblings'} = $dmesg_boot{'siblings'} if !$cpu{'siblings'};
+		$cpu{'stepping'} = $dmesg_boot{'stepping'} if !$cpu{'stepping'};
+		$cpu{'type'} = $dmesg_boot{'type'} if !$cpu{'type'};
+	}
+	if ($extra > 0 && !$cpu{'arch'} && $type ne 'short'){
+		($cpu{'arch'},$cpu{'arch-note'}) = cpu_arch($cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'stepping'});
+		# print "$cpu{'type'},$cpu{'family'},$cpu{'model_id'},$cpu{'arch'}\n";
 	}
 	main::log_data('dump','%cpu',\%cpu) if $b_log;
-	print Data::Dumper::Dumper \%cpu if $test[8];
+	print Data::Dumper::Dumper \%cpu if $dbg[8];
 	eval $end if $b_log;
 	return %cpu;
 }
 
+sub dboot_data {
+	eval $start if $b_log;
+	my ($max_freq,$min_freq,@scalings,%values);
+	my ($family,$flags,$microcode,$model,$sep,$stepping,$type) = ('','','','','','','');
+	my ($cores,$siblings) = (0,0);
+	my ($l1,$l2,$l3) = (0,0,0);
+	# this will be null if it was not readable
+	my $file = $system_files{'dmesg-boot'};
+	if ($dboot{'cpu'}){
+		foreach (@{$dboot{'cpu'}}){
+			# can be ~Features/Features2/AMD Features
+			if (/Features/ || ($bsd_type eq "openbsd" && 
+			 /^cpu0:\s*[a-z0-9]{2,3}(\s|,)[a-z0-9]{2,3}(\s|,)/i)){
+				my @line = split(/:\s*/, lc($_));
+				# free bsd has to have weird syntax: <....<b23>,<b34>>
+				# Features2=0x1e98220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,POPCNT,AESNI,XSAVE,OSXSAVE,AVX>
+				$line[1] =~ s/^[^<]*<|>[^>]*$//g;
+				# then get rid of <b23> stuff
+				$line[1] =~ s/<[^>]+>//g;
+				# handle corner case like ,EL3 32,
+				$line[1] =~ s/ (32|64)/_$1/g;
+				# and replace commas with spaces
+				$line[1] =~ s/,/ /g;
+				$flags .= $sep . $line[1];
+				$sep = ' ';
+			}
+			# cpu0:AMD E1-1200 APU with Radeon(tm) HD Graphics, 1398.66 MHz, 14-02-00
+			elsif (/^cpu0:\s*([^,]+),\s+([0-9\.]+\s*MHz),\s+([0-9a-f]+)-([0-9a-f]+)-([0-9a-f]+)/){
+				$type = cpu_vendor($1);
+				$family = uc($3);
+				$model =  uc($4);
+				$stepping = uc($5);
+				$family =~ s/^0//;
+				$model =~ s/^0//;
+				$stepping =~ s/^0//; # can be 00
+			}
+			# note: cpu cache is in KiB MiB even though they call it KB and MB
+			# cpu31: 32KB 64b/line 8-way I-cache, 32KB 64b/line 8-way D-cache, 512KB 64b/line 8-way L2 cache
+			# 8-way means 1 per core, 16-way means 1/2 per core
+			elsif (/^cpu0:\s*[0-9\.]+[KMG]B\s/){
+				# cpu0: 32KB 64b/line 4-way L1 VIPT I-cache, 32KB 64b/line 4-way L1 D-cache
+				# cpu0:48KB 64b/line 3-way L1 PIPT I-cache, 32KB 64b/line 2-way L1 D-cache
+				if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\s(L1 \S+\s)?I[\s-]?cache/){
+					$l1 = main::translate_size($1);
+				}
+				if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sD[\s-]?cache/){
+					# do nothing, we aren't going to use the D cache
+				}
+				if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sL2[\s-]?cache/){
+					$l2 = main::translate_size($1);
+				}
+				if (/\b([0-9\.]+[KMG])i?B\s\S+\s([0-9]+)-way\sL3[\s-]?cache/){
+					$l3 = main::translate_size($1);
+				}
+			}
+			elsif (/^~Origin:(.+?)[\s,]+(Id|Family|Model|Stepping)/){
+				$type = cpu_vendor($1);
+				if (/\bId\s*=\s*(0x)?([0-9a-f]+)\b/){
+					$microcode = ($1) ? uc($2) : $2;
+				}
+				if (/\bFamily\s*=\s*(0x)?([a-f0-9]+)\b/){
+					$family = ($1) ? uc($2) : $2;
+				}
+				if (/\bModel\s*=\s*(0x)?([a-f0-9]+)\b/){
+					$model = ($1) ? uc($2) : $2;
+				}
+				# they don't seem to use hex for steppings, so convert it
+				if (/\bStepping\s*=\s*(0x)?([0-9a-f]+)\b/){
+					$stepping = (!$1) ? uc(sprintf("%X", $2)) : $2;
+				}
+			}
+			elsif (/^cpu0:.*?[0-9\.]+\s?MHz:\sspeeds:\s(.*?)\s?MHz/){
+				@scalings = split(/[,\s]+/,$1);
+				$min_freq = $scalings[-1];
+				$max_freq = $scalings[0];
+			}
+			# 2 core MT Intel Core/Rzyen similar, use smt 0 as trigger to count:
+			# cpu2:smt 0, core 1, package 0
+			# cpu3:smt 1, core 1, package 0
+			## but: older AMD Athlon 2 core:
+			# cpu0:smt 0, core 0, package 0
+			# cpu0:smt 0, core 0, package 1
+			elsif (/cpu([0-9]+):smt\s([0-9]+),\score\s([0-9]+)(,\spackage\s([0-9]+))?/){
+				$siblings = $1 + 1;
+				$cores += 1 if $2 == 0;
+			}
+		}
+		if ($flags){
+			$flags =~ s/\s+/ /g;
+			$flags =~ s/^\s+|\s+$//g;
+		}
+	}
+	else {
+		if ($file && ! -r $file){
+			$flags = main::row_defaults('dmesg-boot-permissions');
+		}
+	}
+	%values = (
+	'cores' => $cores,
+	'family' => $family,
+	'flags' => $flags,
+	'l1-cache' => $l1,
+	'l2-cache' => $l2,
+	'l3-cache' => $l3,
+	'max-freq' => $max_freq,
+	'microcode' => $microcode,
+	'min-freq' => $min_freq,
+	'model_id' => $model,
+	'scalings' => \@scalings,
+	'siblings' => $siblings,
+	'stepping' => $stepping,
+	'type' => $type,
+	);
+	print Data::Dumper::Dumper \%values if $dbg[27];
+	eval $end if $b_log;
+	return %values;
+}
+sub dmidecode_data {
+	eval $start if $b_log;
+	return if !@dmi;
+	my %dmi_data = ('L1' => 0, 'L2' => 0,'L3' => 0, 'ext-clock' => undef, 'socket' => undef, 
+	'speed' => undef, 'max-speed' => undef, 'upgrade' => undef, 'volts' => undef);
+	my ($id,$amount,$socket,$upgrade);
+	foreach my $item (@dmi){
+		next if ref $item ne 'ARRAY';
+		next if ($item->[0] < 4 || $item->[0] == 5 || $item->[0] == 6);
+		last if $item->[0] > 7;
+		if ($item->[0] == 7){
+			# skip first three rows, we don't need that data
+			($id,$amount) = ('',0);
+			foreach my $value (@$item[3 .. $#$item]){
+				next if $value =~ /~/;
+				# variants: L3 - Cache; L3 Cache; L3-cache; L2 CACHE; CPU Internal L1
+				if ($value =~ /^Socket Designation:.*? (L[1-3])\b/){
+					$id = $1;
+				}
+				# some cpus only show Socket Designation: Internal cache
+				elsif (!$id && $value =~ /^Configuration:.* Level.*?([1-3])\b/){
+					$id = "L$1";
+				}
+				# NOTE: cache is in KiB or MiB but they call it kB or MB
+				# so we send translate_size k or M which trips KiB/MiB mode
+				elsif ($id && $value =~ /^Installed Size:\s+(.*?[kKM])i?B$/){
+					$amount = main::translate_size($1);
+				}
+				if ($id && $amount){
+					$dmi_data{$id} += $amount;
+					last;
+				}
+			}
+		}
+		# note: for multi cpu systems, we're hoping that these values are
+		# the same for each cpu, which in most pc situations they will be,
+		# and ARM etc won't be using dmi data here anyway.
+		# Older dmidecode appear to have unreliable Upgrade outputs
+		elsif ($item->[0] == 4){
+			# skip first three row,s we don't need that data
+			($socket,$upgrade) = (undef);
+			foreach my $value (@$item[3 .. $#$item]){
+				next if $value =~ /~/;
+				# note: on single cpu systems, Socket Designation shows socket type,
+				# but on multi, shows like, CPU1; CPU Socket #2; Socket 0; so check values a bit.
+				# Socket Designation: Intel(R) Core(TM) i5-3470 CPU @ 3.20GHz
+				# Sometimes shows as CPU Socket...
+				if ($value =~ /^Socket Designation:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
+					$upgrade = main::dmi_cleaner($2) if $2 !~ /(cpu|[mg]hz|onboard|socket|@|^#?[0-9]$)/i;
+					# print "$socket_temp\n";
+				}
+				# normally we prefer this value, but sometimes it's garbage
+				# older systems often show: Upgrade: ZIF Socket which is a generic term, legacy
+				elsif ($value =~ /^Upgrade:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
+					# print "$2\n";
+					$socket = main::dmi_cleaner($2) if $2 !~ /(ZIF|\bslot\b)/i;
+				}
+				# seen: Voltage: 5.0 V 2.9 V
+				elsif ($value =~ /^Voltage:\s*([0-9\.]+)\s*(V|Volts)?\b/i){
+					$dmi_data{'volts'} = main::dmi_cleaner($1);
+				}
+				elsif ($value =~ /^Current Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
+					$dmi_data{'speed'} = main::dmi_cleaner($1);
+				}
+				elsif ($value =~ /^Max Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
+					$dmi_data{'max-speed'} = main::dmi_cleaner($1);
+				}
+				elsif ($value =~ /^External Clock:\s*([0-9\.]+\s*[MGK]Hz)\b/){
+					$dmi_data{'ext-clock'} = main::dmi_cleaner($1);
+				}
+			}
+		}
+	}
+	# Seen older cases where Upgrade: Other value exists
+	if ($socket || $upgrade){
+		if ($socket && $upgrade){
+			$upgrade = undef if $socket eq $upgrade;
+		}
+		elsif ($upgrade){
+			$socket = $upgrade;
+			$upgrade = undef;
+		}
+		$dmi_data{'socket'} = $socket;
+		$dmi_data{'upgrade'} = $upgrade;
+	}
+	main::log_data('dump','%dmi_data',\%dmi_data) if $b_log;
+	# print Data::Dumper::Dumper \%dmi_data;
+	eval $end if $b_log;
+	return %dmi_data;
+}
+
 sub cpu_properties {
 	my ($cpu) = @_;
 	my ($b_amd_zen,$b_epyc,$b_ht,$b_elbrus,$b_intel,$b_ryzen,$b_xeon);
-	if ($cpu->{'type'} ){
+	my ($cores_x,$cache_check) = (1,'');
+	if ($cpu->{'type'}){
 		if ($cpu->{'type'} eq 'intel'){
 			$b_intel = 1;
 			$b_xeon = 1 if $cpu->{'model_name'} =~ /Xeon/i;
 		}
-		elsif ($cpu->{'type'} eq 'amd' ){
-			if ( $cpu->{'family'} && $cpu->{'family'} eq '17' ) {
+		elsif ($cpu->{'type'} eq 'amd'){
+			if ($cpu->{'family'} && $cpu->{'family'} eq '17'){
 				$b_amd_zen = 1;
-				if ($cpu->{'model_name'} ){
-					if ($cpu->{'model_name'} =~ /Ryzen/i ){ 
+				if ($cpu->{'model_name'}){
+					if ($cpu->{'model_name'} =~ /Ryzen/i){ 
 						$b_ryzen = 1;
 					}
 					elsif ($cpu->{'model_name'} =~ /EPYC/i){
@@ -8173,57 +9130,41 @@ sub cpu_properties {
 				}
 			}
 		}
-		elsif ($cpu->{'type'} eq 'elbrus') {
+		elsif ($cpu->{'type'} eq 'elbrus'){
 			$b_elbrus = 1;
 		}
 	}
-	#my @dies = $phys[0]->[0];
+	# my @dies = $phys[0]->[0];
 	my @phys = @{$cpu->{'ids'}};
-	my $phyical_count = 0;
-	#my $phyical_count = scalar @phys;
+	my $physical_count = 0;
+	# my $physical_count = scalar @phys;
 	my @processors;
 	my ($speed,$speed_key);
 	# handle case where cpu reports say, phys id 0, 2, 4, 6 [yes, seen it]
-	foreach (@phys) {
-		$phyical_count++ if $_;
+	foreach (@phys){
+		$physical_count++ if $_;
 	}
 	# count unique processors ##
 	# note, this fails for intel cpus at times
 	@processors = @{$cpu->{'processors'}};
-	#print ref $cpu->{'processors'}, "\n";
+	# print ref $cpu->{'processors'}, "\n";
 	my $processors_count = scalar @processors;
-	#print "p count:$processors_count\n";
-	#print Data::Dumper::Dumper \@processors;
+	# print "p count:$processors_count\n";
+	# print Data::Dumper::Dumper \@processors;
 	# $cpu_cores is per physical cpu
 	my ($cpu_layout,$cpu_type,$min_max,$min_max_key) = ('','','','');
 	my ($dmi_max_speed,$dmi_speed,$ext_clock,$socket,$upgrade,$volts) = (undef);
 	my ($l1_cache,$l2_cache,$l3_cache,$core_count,$cpu_cores,$die_count) = (0,0,0,0,0,0);
 	# note: elbrus supports turning off cores, so we need to add one for cases where rounds to 0 or 1 less
 	if ($b_elbrus && $processors_count){
-		my @elbrus = elbrus_data($cpu->{'model_id'},$processors_count,$cpu->{'arch'});
+		my @elbrus = elbrus_data($cpu->{'family'},$cpu->{'model_id'},$processors_count,$cpu->{'arch'});
 		$cpu_cores = $elbrus[0];
-		$phyical_count = $elbrus[1];
+		$physical_count = $elbrus[1];
 		$cpu->{'arch'} = $elbrus[2];
-		# print 'model id: ' . $cpu->{'model_id'} . ' arch: ' . $cpu->{'arch'} . " cpc: $cpu_cores phyc: $phyical_count proc: $processors_count \n";
-	}
-	$phyical_count ||= 1; # assume 1 if no id found, as with ARM
-	if ($extra > 1){
-		# note: dmidecode has one entry per cpu per cache type, so this already 
-		# has done the arithmetic on > 1 cpus for L1 and L3. 
-		my %cpu_dmi = cpu_dmi_data();
-		$l1_cache = $cpu_dmi{'L1'} if $cpu_dmi{'L1'};
-		$l3_cache = $cpu_dmi{'L3'} if $cpu_dmi{'L3'};
-		# bsd sysctl can have these values so let's check just in case
-		$l1_cache = $cpu->{'l1-cache'} * $phyical_count if !$l1_cache && $cpu->{'l1-cache'};
-		$l3_cache = $cpu->{'l3-cache'} * $phyical_count if !$l3_cache && $cpu->{'l3-cache'};
-		$dmi_max_speed = $cpu_dmi{'max-speed'} if $cpu_dmi{'max-speed'};
-		$socket = $cpu_dmi{'socket'} if $cpu_dmi{'socket'};
-		$upgrade = $cpu_dmi{'upgrade'} if $cpu_dmi{'upgrade'};
-		$dmi_speed = $cpu_dmi{'speed'} if $cpu_dmi{'speed'};
-		$ext_clock = $cpu_dmi{'ext-clock'} if $cpu_dmi{'ext-clock'};
-		$volts = $cpu_dmi{'volts'} if $cpu_dmi{'volts'};
+		# print 'model id: ' . $cpu->{'model_id'} . ' arch: ' . $cpu->{'arch'} . " cpc: $cpu_cores phyc: $physical_count proc: $processors_count \n";
 	}
-	foreach my $die_ref ( @phys ){
+	$physical_count ||= 1; # assume 1 if no id found, as with ARM
+	foreach my $die_ref (@phys){
 		next if ref $die_ref ne 'ARRAY';
 		$core_count = 0;
 		$die_count = scalar @$die_ref;
@@ -8237,7 +9178,7 @@ sub cpu_properties {
 			foreach my $id (@$core_ref){
 				$core_count++ if defined $id && !$b_arm;
 			}
-			#print 'cores: ' . $core_count, "\n";
+			# print 'cores: ' . $core_count, "\n";
 		}
 	}
 	# this covers potentially cases where ARM cpus have > 1 die 
@@ -8246,22 +9187,22 @@ sub cpu_properties {
 	# NOTE: amd A6-4400M APU 2 core reports: cores: 1 siblings: 2
 	# NOTE: AMD A10-5800K APU 4 core reports: cores: 2 siblings: 4
 	if (!$cpu_cores){
-		if ($cpu->{'cores'} && ! $core_count || $cpu->{'cores'} >= $core_count){
+		if ($cpu->{'cores'} && !$core_count || $cpu->{'cores'} >= $core_count){
 			$cpu_cores = $cpu->{'cores'};
 		}
 		elsif ($core_count > $cpu->{'cores'}){
 			$cpu_cores = $core_count;
 		}
 	}
-	#print "cpu-c:$cpu_cores\n";
+	# print "cpu-c:$cpu_cores\n";
 	#$cpu_cores = $cpu->{'cores'}; 
 	# like, intel core duo
 	# NOTE: sadly, not all core intel are HT/MT, oh well...
 	# xeon may show wrong core / physical id count, if it does, fix it. A xeon
 	# may show a repeated core id : 0 which gives a fake num_of_cores=1
 	if ($b_intel){
-		if ($cpu->{'siblings'} && $cpu->{'siblings'} > 1 && $cpu->{'cores'} && $cpu->{'cores'} > 1 ){
-			if ( $cpu->{'siblings'}/$cpu->{'cores'} == 1 ){
+		if ($cpu->{'siblings'} && $cpu->{'siblings'} > 1 && $cpu->{'cores'} && $cpu->{'cores'} > 1){
+			if ($cpu->{'siblings'}/$cpu->{'cores'} == 1){
 				$b_intel = 0;
 				$b_ht = 0;
 			}
@@ -8280,7 +9221,7 @@ sub cpu_properties {
 		$cpu->{'dies'} = ($temp[1] && $temp[1] > 0) ? $temp[0]++ : $temp[0];
 	}
 	# these always have 4 dies
-	elsif ($b_epyc) {
+	elsif ($b_epyc){
 		$cpu_cores = $cpu->{'cores'}; 
 		$cpu->{'dies'} = 4;
 	}
@@ -8289,8 +9230,8 @@ sub cpu_properties {
 # 	}
 	# final check, override the num of cores value if it clearly is wrong
 	# and use the raw core count and synthesize the total instead of real count
-	if ( $cpu_cores == 0 && ($cpu->{'cores'} * $phyical_count > 1)){
-		$cpu_cores = ($cpu->{'cores'} * $phyical_count);
+	if ($cpu_cores == 0 && ($cpu->{'cores'} * $physical_count > 1)){
+		$cpu_cores = ($cpu->{'cores'} * $physical_count);
 	}
 	# last check, seeing some intel cpus and vms with intel cpus that do not show any
 	# core id data at all, or siblings.
@@ -8298,9 +9239,9 @@ sub cpu_properties {
 		$cpu_cores = $processors_count;
 	}
 	# this happens with BSDs which have very little cpu data available
-	if ( $processors_count == 0 && $cpu_cores > 0 ){
+	if ($processors_count == 0 && $cpu_cores > 0){
 		$processors_count = $cpu_cores;
-		if ($bsd_type && ($b_ht || $b_amd_zen) && $cpu_cores > 2 ){
+		if ($bsd_type && ($b_ht || $b_amd_zen) && $cpu_cores > 2){
 			$cpu_cores = $cpu_cores/2;;
 		}
 		my $count = $processors_count;
@@ -8313,11 +9254,25 @@ sub cpu_properties {
 			$cpu->{'processors'}[$_] = 0;
 		}
 	}
+	# so far only OpenBSD has a way to detect MT cpus
+	if ($bsd_type){
+		if ($cpu->{'siblings'}){
+			$cores_x = $cpu_cores if $cpu_cores && $cpu_cores > 1;
+		}
+		# if no siblings we couldn't get MT status of cpu so can't trust cache
+		else {
+			$cache_check = main::row_defaults('note-check');
+		}
+	}
+	# only elbrus shows L1 / L3 cache data in cpuinfo
+	else {
+		$cores_x = $cpu_cores if $cpu_cores && $cpu_cores > 1;
+	}
 	# last test to catch some corner cases 
 	# seen a case where a xeon vm in a dual xeon system actually had 2 cores, no MT
 	# so it reported 4 siblings, 2 cores, but actually only had 1 core per virtual cpu
-	#print "prc: $processors_count phc: $phyical_count coc: $core_count cpc: $cpu_cores\n";
-	if (!$b_arm && $processors_count == $phyical_count*$core_count && $cpu_cores > $core_count){
+	# print "prc: $processors_count phc: $physical_count coc: $core_count cpc: $cpu_cores\n";
+	if (!$b_arm && $processors_count == $physical_count*$core_count && $cpu_cores > $core_count){
 		$b_ht = 0;
 		#$b_xeon = 0;
 		$b_intel = 0;
@@ -8325,39 +9280,60 @@ sub cpu_properties {
 		$core_count = 1;
 		$cpu->{'siblings'} = 1;
 	}
-	#print "pc: $processors_count s: $cpu->{'siblings'} cpuc: $cpu_cores corec: $core_count\n";
+	if ($extra > 1 || ($bsd_type && !$cpu->{'l2-cache'})){
+		# note: dmidecode has one entry per cpu per cache type, so this already 
+		# has done the arithmetic on > 1 cpus for L1 and L3. 
+		my %cpu_dmi = dmidecode_data();
+		my $multi = ($bsd_type) ? $cpu_cores: 1;
+		$l1_cache = $cpu_dmi{'L1'} * $physical_count if $cpu_dmi{'L1'};
+		# note: bsds often won't have L2 catch data found yet
+		$cpu->{'l2-cache'} = $cpu_dmi{'L2'} if !$cpu->{'l2-cache'} && $cpu_dmi{'L2'};
+		$l3_cache = $cpu_dmi{'L3'} * $physical_count if $cpu_dmi{'L3'};
+		# bsd sysctl can have these values so let's check just in case
+		$l1_cache = $cpu->{'l1-cache'} * $cores_x * $physical_count if !$l1_cache && $cpu->{'l1-cache'};
+		# L3 is almost always per physical cpu, not per core
+		$l3_cache = $cpu->{'l3-cache'} * $physical_count if !$l3_cache && $cpu->{'l3-cache'};
+		$cache_check = '' if !$l1_cache && !$cpu->{'l2-cache'} && !$l3_cache; # nothing to check!
+		$dmi_max_speed = $cpu_dmi{'max-speed'} if $cpu_dmi{'max-speed'};
+		$socket = $cpu_dmi{'socket'} if $cpu_dmi{'socket'};
+		$upgrade = $cpu_dmi{'upgrade'} if $cpu_dmi{'upgrade'};
+		$dmi_speed = $cpu_dmi{'speed'} if $cpu_dmi{'speed'};
+		$ext_clock = $cpu_dmi{'ext-clock'} if $cpu_dmi{'ext-clock'};
+		$volts = $cpu_dmi{'volts'} if $cpu_dmi{'volts'};
+	}
+	# print "pc: $processors_count s: $cpu->{'siblings'} cpuc: $cpu_cores corec: $core_count\n";
 	# Algorithm:
 	# if > 1 processor && processor id (physical id) == core id then Multi threaded (MT)
 	# if siblings > 1 && siblings ==  2 * num_of_cores ($cpu->{'cores'}) then Multi threaded (MT)
 	# if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
 	# if > 1 processor && processor ids (physical id) > 1 then Symmetric Multi Processing (SMP)
 	# if = 1 processor then single core/processor Uni-Processor (UP)
-	if ( $processors_count > 1 || ( $b_intel && $cpu->{'siblings'} > 0 ) ) {
+	if ($processors_count > 1 || ($b_intel && $cpu->{'siblings'} > 0)){
 		# non-multicore MT
-		if ($processors_count == ($phyical_count * $cpu_cores * 2)){
-			#print "mt:1\n";
+		if ($processors_count == ($physical_count * $cpu_cores * 2)){
+			# print "mt:1\n";
 			$cpu_type .= 'MT'; 
 		}
 # 		elsif ($b_xeon && $cpu->{'siblings'} > 1){
-# 			#print "mt:2\n";
+# 			# print "mt:2\n";
 # 			$cpu_type .= 'MT'; 
 # 		}
-		elsif ($cpu->{'siblings'} > 1 && ($cpu->{'siblings'} == 2 * $cpu_cores )){
-			#print "mt:3\n";
+		elsif ($cpu->{'siblings'} > 1 && ($cpu->{'siblings'} == 2 * $cpu_cores)){
+			# print "mt:3\n";
 			$cpu_type .= 'MT'; 
 		}
 		# non-MT multi-core or MT multi-core
-		if ( ($processors_count == $cpu_cores ) || ($phyical_count < $cpu_cores)){
+		if (($processors_count == $cpu_cores) || ($physical_count < $cpu_cores)){
 			my $sep = ($cpu_type) ? ' ' : '' ;
 			$cpu_type .= $sep . 'MCP'; 
 		}
 		# only solidly known > 1 die cpus will use this, ryzen and arm for now
-		if ( $cpu->{'dies'} > 1 ){
+		if ($cpu->{'dies'} > 1){
 			my $sep = ($cpu_type) ? ' ' : '' ;
 			$cpu_type .= $sep . 'MCM'; 
 		}
 		# >1 cpu sockets active: Symetric Multi Processing
-		if ($phyical_count > 1){
+		if ($physical_count > 1){
 			my $sep = ($cpu_type) ? ' ' : '' ;
 			$cpu_type .= $sep . 'SMP'; 
 		}
@@ -8365,28 +9341,33 @@ sub cpu_properties {
 	else {
 		$cpu_type = 'UP';
 	}
-	if ($phyical_count > 1){
-		$cpu_layout = $phyical_count . 'x ';
+	if ($physical_count > 1){
+		$cpu_layout = $physical_count . 'x ';
 	}
 	$cpu_layout .= count_alpha($cpu_cores) . 'Core';
 	$cpu_layout .= ' (' . $cpu->{'dies'}. '-Die)' if !$bsd_type && $cpu->{'dies'} > 1;
+	if (!$cpu->{'l2-cache'}){
+		# do nothing
+	}
 	# the only possible change for bsds is if we can get phys counts in the future
-	if ($bsd_type){
-		$l2_cache = $cpu->{'l2-cache'} * $phyical_count;
+	# Looks like Intel on bsd shows L2 per core, not total. Note: Pentium N3540
+	# uses 2(not 4)xL2 cache size for 4 cores, sigh... you just can't win...
+	elsif ($bsd_type){
+		$l2_cache = $cpu->{'l2-cache'} * $cores_x * $physical_count;
 	}
 	# AMD SOS chips appear to report full L2 cache per core
 	elsif ($cpu->{'type'} eq 'amd' && ($cpu->{'family'} eq '14' || $cpu->{'family'} eq '15' || $cpu->{'family'} eq '16')){
-		$l2_cache = $cpu->{'l2-cache'} * $phyical_count;
+		$l2_cache = $cpu->{'l2-cache'} * $physical_count;
 	}
 	elsif ($cpu->{'type'} ne 'intel'){
-		$l2_cache = $cpu->{'l2-cache'} * $cpu_cores * $phyical_count;
+		$l2_cache = $cpu->{'l2-cache'} * $cpu_cores * $physical_count;
 	}
 	## note: this handles how intel reports L2, total instead of per core like AMD does
 	# note that we need to multiply by number of actual cpus here to get true cache size
 	else {
-		$l2_cache = $cpu->{'l2-cache'} * $phyical_count;
+		$l2_cache = $cpu->{'l2-cache'} * $physical_count;
 	}
-	if ($cpu->{'cur-freq'} && $cpu->{'min-freq'} && $cpu->{'max-freq'} ){
+	if ($cpu->{'cur-freq'} && $cpu->{'min-freq'} && $cpu->{'max-freq'}){
 		$min_max = "$cpu->{'min-freq'}/$cpu->{'max-freq'} MHz";
 		$min_max_key = "min/max";
 		$speed_key = ($show{'short'} || $show{'cpu-basic'}) ? 'speed' : 'Speed';
@@ -8413,11 +9394,12 @@ sub cpu_properties {
 		$speed = "$cpu->{'cur-freq'} MHz";
  	}
  	
- 	if ( !$bits_sys && !$b_arm && $cpu->{'flags'} ){
+ 	if (!$bits_sys && !$b_arm && $cpu->{'flags'}){
 		$bits_sys = ($cpu->{'flags'} =~ /\blm\b/) ? 64 : 32;
 	}
 	my %cpu_properties = (
 	'bits-sys' => $bits_sys,
+	'cache-check' => $cache_check,
 	'cpu-layout' => $cpu_layout,
 	'cpu-type' => $cpu_type,
 	'dmi-max-speed' => $dmi_max_speed,
@@ -8435,101 +9417,14 @@ sub cpu_properties {
 	'l3-cache' => $l3_cache,
 	);
 	main::log_data('dump','%cpu_properties',\%cpu_properties) if $b_log;
-	#print Data::Dumper::Dumper $cpu;
-	#print Data::Dumper::Dumper \%cpu_properties;
-	#my $dc = scalar @dies;
-	#print 'phys: ' . $pc . ' dies: ' . $dc, "\n";
+	# print Data::Dumper::Dumper $cpu;
+	# print Data::Dumper::Dumper \%cpu_properties;
+	# my $dc = scalar @dies;
+	# print 'phys: ' . $pc . ' dies: ' . $dc, "\n";
 	eval $end if $b_log;
 	return %cpu_properties;
 }
-sub cpu_dmi_data {
-	eval $start if $b_log;
-	return if !@dmi;
-	my %dmi_data = ('L1' => 0, 'L2' => 0,'L3' => 0, 'ext-clock' => undef, 'socket' => undef, 
-	'speed' => undef, 'max-speed' => undef, 'upgrade' => undef, 'volts' => undef);
-	my ($id,$amount,$socket,$upgrade);
-	foreach my $item (@dmi){
-		next if ref $item ne 'ARRAY';
-		next if ($item->[0] < 4 || $item->[0] == 5 || $item->[0] == 6);
-		last if $item->[0] > 7;
-		if ($item->[0] == 7){
-			# skip first three row, we don't need that data
-			($id,$amount) = ('',0);
-			foreach my $value (@$item[3 .. $#$item]){
-				next if $value =~ /~/;
-				# variants: L3 - Cache; L3 Cache; L3-cache; CPU Internal L1
-				if ($value =~ /^Socket Designation:.* (L[1-3])\b/){
-					$id = $1;
-				}
-				# some cpus only show Socket Designation: Internal cache
-				elsif (!$id && $value =~ /^Configuration:.* Level.*([1-3])\b/){
-					$id = "L$1";
-				}
-				elsif ($id && $value =~ /^Installed Size:\s+(.*B)$/){
-					$amount = main::translate_size($1);
-				}
-				if ($id && $amount){
-					$dmi_data{$id} += $amount;
-					last;
-				}
-			}
-		}
-		# note: for multi cpu systems, we're hoping that these values are
-		# the same for each cpu, which in most pc situations they will be,
-		# and ARM etc won't be using dmi data here anyway.
-		# Older dmidecode appear to have unreliable Upgrade outputs
-		elsif ($item->[0] == 4){
-			# skip first three row, we don't need that data
-			($socket,$upgrade) = (undef);
-			foreach my $value (@$item[3 .. $#$item]){
-				next if $value =~ /~/;
-				# note: on single cpu systems, Socket Designation shows socket type,
-				# but on multi, shows like, CPU1; CPU Socket #2; Socket 0; so check values a bit.
-				# Socket Designation: Intel(R) Core(TM) i5-3470 CPU @ 3.20GHz
-				# Sometimes shows as CPU Socket...
-				if ($value =~ /^Socket Designation:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
-					$upgrade = main::dmi_cleaner($2) if $2 !~ /(cpu|[mg]hz|onboard|socket|@|^#?[0-9]$)/i;
-					#print "$socket_temp\n";
-				}
-				# normally we prefer this value, but sometimes it's garbage
-				# older systems often show: Upgrade: ZIF Socket which is a generic term, legacy
-				elsif ($value =~ /^Upgrade:\s*(CPU\s*Socket|Socket)?[\s-]*(.*)$/i){
-					#print "$2\n";
-					$socket = main::dmi_cleaner($2) if $2 !~ /(ZIF|\bslot\b)/i;
-				}
-				# seen: Voltage: 5.0 V 2.9 V
-				elsif ($value =~ /^Voltage:\s*([0-9\.]+)\s*(V|Volts)?\b/i){
-					$dmi_data{'volts'} = main::dmi_cleaner($1);
-				}
-				elsif ($value =~ /^Current Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
-					$dmi_data{'speed'} = main::dmi_cleaner($1);
-				}
-				elsif ($value =~ /^Max Speed:\s*([0-9\.]+)\s*([MGK]Hz)?\b/i){
-					$dmi_data{'max-speed'} = main::dmi_cleaner($1);
-				}
-				elsif ($value =~ /^External Clock:\s*([0-9\.]+\s*[MGK]Hz)\b/){
-					$dmi_data{'ext-clock'} = main::dmi_cleaner($1);
-				}
-			}
-		}
-	}
-	# Seen older cases where Upgrade: Other value exists
-	if ($socket || $upgrade){
-		if ($socket && $upgrade){
-			$upgrade = undef if $socket eq $upgrade;
-		}
-		elsif ($upgrade){
-			$socket = $upgrade;
-			$upgrade = undef;
-		}
-		$dmi_data{'socket'} = $socket;
-		$dmi_data{'upgrade'} = $upgrade;
-	}
-	main::log_data('dump','%dmi_data',\%dmi_data) if $b_log;
-	# print Data::Dumper::Dumper \%dmi_data;
-	eval $end if $b_log;
-	return %dmi_data;
-}
+
 sub cpu_bugs_sys {
 	eval $start if $b_log;
 	my (@bugs,$type,$value);
@@ -8537,7 +9432,7 @@ sub cpu_bugs_sys {
 	my @items = main::globber('/sys/devices/system/cpu/vulnerabilities/*');
 	if (@items){
 		foreach (@items){
-			$value = ( -r $_) ? main::reader($_,'',0) : main::row_defaults('root-required');
+			$value = (-r $_) ? main::reader($_,'',0) : main::row_defaults('root-required');
 			$type = ($value =~ /^Mitigation:/) ? 'mitigation': 'status';
 			$_ =~ s/.*\/([^\/]+)$/$1/;
 			$value =~ s/Mitigation: //;
@@ -8563,14 +9458,15 @@ sub cpu_speeds {
 		}
 	}
 	if (!@speeds){
+		# handle special case, FB, where we use undef for no processor speed found
 		foreach (@$processors){
-			if ($_ || $_ eq '0'){
+			if ($_ || (defined $_ && $_ eq '0')){
 				$_ = sprintf("%.0f", $_);
 				push(@speeds, $_);
 			}
 		}
 	}
-	#print join('; ', @speeds), "\n";
+	# print join('; ', @speeds), "\n";
 	eval $end if $b_log;
 	return @speeds;
 }
@@ -8641,9 +9537,10 @@ sub set_cpu_speeds_sys {
 		}
 		# policy4/cpuinfo_max_freq:["2000000"] policy0/cpuinfo_max_freq:["1500000"] 
 		# policy4/cpuinfo_min_freq:["200000"]
-		if ( (scalar @max_freq < 2 && scalar @min_freq < 2 ) && 
+		if ((scalar @max_freq < 2 && scalar @min_freq < 2) && 
 		 (defined $speeds{'min-freq'} && defined $speeds{'max-freq'}) &&
-		 ($speeds{'min-freq'} > $speeds{'max-freq'} || $speeds{'min-freq'} == $speeds{'max-freq'} )){
+		 ($speeds{'min-freq'} > $speeds{'max-freq'} || 
+		 $speeds{'min-freq'} == $speeds{'max-freq'})){
 			$speeds{'min-freq'} = 0;
 		}
 	}
@@ -8671,66 +9568,34 @@ sub cpu_dies_sys {
 # returns: 0 - per cpu cores; 1 - phys cpu count; 2 - override model defaul names
 sub elbrus_data {
 	eval $start if $b_log;
-	my ($model_id,$count,$arch) = @_;
+	my ($family_id,$model_id,$count,$arch) = @_;
 	# 0: cores
-	my @cores;
 	my @return = (0,1,$arch);
-	$cores[1] = 1;
-	$cores[2] = 1;
-	$cores[3] = 4;
-	$cores[4] = 2;
-	$cores[6] = 1;
-	$cores[7] = 8;
-	$cores[8] = 1;
-	$cores[9] = 8;
-	$cores[10] = 12;
-	$cores[11] = 16;
-	$cores[12] = 2;
-	if (main::is_numeric($model_id) && $cores[$model_id]){
-		$return[0] = $cores[$model_id] ;
-	}
+	my %cores = (
+	# key=family id + model id
+	'41' => 1,
+	'42' => 1,
+	'43' => 4,
+	'44' => 2,
+	'46' => 1,
+	'47' => 8,
+	'48' => 1,
+	'49' => 8,
+	'59' => 8,
+	'4A' => 12,
+	'4B' => 16,
+	'4C' => 2,
+	'6A' => 12,
+	'6B' => 16,
+	'6C' => 2,
+	);
+	$return[0] = $cores{$family_id . $model_id} if $cores{$family_id . $model_id};
 	if ($return[0]){
 		$return[1] = ($count % $return[0]) ? int($count/$return[0]) + 1 : $count/$return[0];
 	}
 	eval $end if $b_log;
 	return @return;
 }
-sub cpu_flags_bsd {
-	eval $start if $b_log;
-	my ($flags,$sep) = ('','');
-	# this will be null if it was not readable
-	my $file = main::system_files('dmesg-boot');
-	if ( @dmesg_boot){
-		foreach (@dmesg_boot){
-			if ( /Features/ || ( $bsd_type eq "openbsd" && /^cpu0:\s*[a-z0-9]{2,3}(\s|,)[a-z0-9]{2,3}(\s|,)/i ) ) {
-				my @line = split(/:\s*/, lc($_));
-				# free bsd has to have weird syntax: <....<b23>,<b34>>
-				# Features2=0x1e98220b<SSE3,PCLMULQDQ,MON,SSSE3,CX16,SSE4.1,SSE4.2,POPCNT,AESNI,XSAVE,OSXSAVE,AVX>
-				$line[1] =~ s/^[^<]*<|>[^>]*$//g;
-				# then get rid of <b23> stuff
-				$line[1] =~ s/<[^>]+>//g;
-				# and replace commas with spaces
-				$line[1] =~ s/,/ /g;
-				$flags .= $sep . $line[1];
-				$sep = ' ';
-			}
-			elsif (/real mem/){
-				last;
-			}
-		}
-		if ($flags){
-			$flags =~ s/\s+/ /g;
-			$flags =~ s/^\s+|\s+$//g;
-		}
-	}
-	else {
-		if ( $file && ! -r $file ){
-			$flags = main::row_defaults('dmesg-boot-permissions');
-		}
-	}
-	eval $end if $b_log;
-	return $flags;
-}
 
 # only elbrus ID is actually used live
 sub cpu_vendor {
@@ -8738,7 +9603,7 @@ sub cpu_vendor {
 	my ($string) = @_;
 	my ($vendor) = ('');
 	$string = lc($string);
-	if ($string =~ /intel/) {
+	if ($string =~ /intel/){
 		$vendor = "intel"
 	}
 	elsif ($string =~ /amd/){
@@ -8783,8 +9648,8 @@ sub system_cpu_name {
 	}
 	# synthesize it, [4] will be like: cortex-a15-timer; sunxi-timer
 	# so far all with this directory show soc name, not cpu name for timer
-	elsif (! -d '/sys/firmware/devicetree/base' && @devices_timer){
-		foreach my $working (@devices_timer){
+	elsif (! -d '/sys/firmware/devicetree/base' && $devices{'timer'}){
+		foreach my $working (@{$devices{'timer'}}){
 			next if $working->[0] ne 'timer' || !$working->[4] || $working->[4] =~ /timer-mem$/;
 			$working->[4] =~ s/(-system)?-timer$//;
 			$compat = $working->[4];
@@ -8800,197 +9665,312 @@ sub cpu_arch {
 	eval $start if $b_log;
 	my ($type,$family,$model,$stepping) = @_;
 	$stepping = 0 if !main::is_numeric($stepping);
+	$family ||= '';
+	$model ||= '';
 	my ($arch,$note) = ('','');
 	my $check = main::row_defaults('note-check');
 	# See: docs/inxi-resources.txt 
 	# print "type:$type fam:$family model:$model step:$stepping\n";
-	if ( $type eq 'amd'){
+	if ($type eq 'amd'){
 		if ($family eq '4'){
-			if ( $model =~ /^(3|7|8|9|A)$/ ) {$arch = 'Am486'}
-			elsif ( $model =~ /^(E|F)$/ ) {$arch = 'Am5x86'}
+			if ($model =~ /^(3|7|8|9|A)$/){
+				$arch = 'Am486'}
+			elsif ($model =~ /^(E|F)$/){
+				$arch = 'Am5x86'}
 		}
 		elsif ($family eq '5'){
-			if ( $model =~ /^(0|1|2|3)$/ ) {$arch = 'K5'}
-			elsif ( $model =~ /^(6|7)$/ ) {$arch = 'K6'}
-			elsif ( $model =~ /^(8)$/ ) {$arch = 'K6-2'}
-			elsif ( $model =~ /^(9|D)$/ ) {$arch = 'K6-3'}
-			elsif ( $model =~ /^(A)$/ ) {$arch = 'Geode'}
+			if ($model =~ /^(0|1|2|3)$/){
+				$arch = 'K5'}
+			elsif ($model =~ /^(6|7)$/){
+				$arch = 'K6'}
+			elsif ($model =~ /^(8)$/){
+				$arch = 'K6-2'}
+			elsif ($model =~ /^(9|D)$/){
+				$arch = 'K6-3'}
+			elsif ($model =~ /^(A)$/){
+				$arch = 'Geode'}
 			}
 		elsif ($family eq '6'){
-			if ( $model =~ /^(1|2)$/ ) {$arch = 'K7'}
-			elsif ( $model =~ /^(3|4)$/ ) {$arch = 'K7 Thunderbird'}
-			elsif ( $model =~ /^(6|7|8|A)$/ ) {$arch = 'K7 Palomino+'}
-			else {$arch = 'K7'}
+			if ($model =~ /^(1|2)$/){
+				$arch = 'K7'}
+			elsif ($model =~ /^(3|4)$/){
+				$arch = 'K7 Thunderbird'}
+			elsif ($model =~ /^(6|7|8|A)$/){
+				$arch = 'K7 Palomino+'}
+			else {
+				$arch = 'K7'}
 		}
 		elsif ($family eq 'F'){
-			if ( $model =~ /^(4|5|7|8|B|C|E|F|14|15|17|18|1B|1C|1F)$/ ) {$arch = 'K8'}
-			elsif ( $model =~ /^(21|23|24|25|27|28|2C|2F)$/ ) {$arch = 'K8 rev.E'}
-			elsif ( $model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|7F|C1)$/ ) {$arch = 'K8 rev.F+'}
-			else {$arch = 'K8'}
+			if ($model =~ /^(4|5|7|8|B|C|E|F|14|15|17|18|1B|1C|1F)$/){
+				$arch = 'K8'}
+			elsif ($model =~ /^(21|23|24|25|27|28|2C|2F)$/){
+				$arch = 'K8 rev.E'}
+			elsif ($model =~ /^(41|43|48|4B|4C|4F|5D|5F|68|6B|6C|6F|7C|7F|C1)$/){
+				$arch = 'K8 rev.F+'}
+			else {
+				$arch = 'K8'}
 		}
 		elsif ($family eq '10'){
-			if ( $model =~ /^(2|4|5|6|8|9|A)$/ ) {$arch = 'K10'}
-			else {$arch = 'K10'}
+			if ($model =~ /^(2|4|5|6|8|9|A)$/){
+				$arch = 'K10'}
+			else {
+				$arch = 'K10'}
 		}
 		elsif ($family eq '11'){
-			if ( $model =~ /^(3)$/ ) {$arch = 'Turion X2 Ultra'}
+			if ($model =~ /^(3)$/){
+				$arch = 'Turion X2 Ultra'}
 		}
 		# might also need cache handling like 14/16
 		elsif ($family eq '12'){
-			if ( $model =~ /^(1)$/ ) {$arch = 'Fusion'}
-			else {$arch = 'Fusion'}
+			if ($model =~ /^(1)$/){
+				$arch = 'Fusion'}
+			else {
+				$arch = 'Fusion'}
 		}
 		# SOC, apu
 		elsif ($family eq '14'){
-			if ( $model =~ /^(1|2)$/ ) {$arch = 'Bobcat'}
-			else {$arch = 'Bobcat'}
+			if ($model =~ /^(1|2)$/){
+				$arch = 'Bobcat'}
+			else {
+				$arch = 'Bobcat'}
 		}
 		elsif ($family eq '15'){
-			if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/ ) {$arch = 'Bulldozer'}
-			elsif ( $model =~ /^(10|11|12|13|14|15|16|17|18|19|1A|1B|1C|1D|1E|1F)$/ ) {$arch = 'Piledriver'}
-			elsif ( $model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/ ) {$arch = 'Steamroller'}
-			elsif ( $model =~ /^(60|61|62|63|64|65|66|67|68|69|6A|6B|6C|6D|6E|6F|70|71|72|73|74|75|76|77|78|79|7A|7B|7C|7D|7E|7F)$/ ) {$arch = 'Excavator'}
-			else {$arch = 'Bulldozer'}
+			if ($model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/){
+				$arch = 'Bulldozer'}
+			elsif ($model =~ /^(10|11|12|13|14|15|16|17|18|19|1A|1B|1C|1D|1E|1F)$/){
+				$arch = 'Piledriver'}
+			elsif ($model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/){
+				$arch = 'Steamroller'}
+			elsif ($model =~ /^(60|61|62|63|64|65|66|67|68|69|6A|6B|6C|6D|6E|6F|70|71|72|73|74|75|76|77|78|79|7A|7B|7C|7D|7E|7F)$/){
+				$arch = 'Excavator'}
+			else {
+				$arch = 'Bulldozer'}
 		}
 		# SOC, apu
 		elsif ($family eq '16'){
-			if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/ ) {$arch = 'Jaguar'}
-			elsif ( $model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/ ) {$arch = 'Puma'}
-			else {$arch = 'Jaguar'}
+			if ($model =~ /^(0|1|2|3|4|5|6|7|8|9|A|B|C|D|E|F)$/){
+				$arch = 'Jaguar'}
+			elsif ($model =~ /^(30|31|32|33|34|35|36|37|38|39|3A|3B|3C|3D|3E|3F)$/){
+				$arch = 'Puma'}
+			else {
+				$arch = 'Jaguar'}
 		}
 		elsif ($family eq '17'){
-			if ( $model =~ /^(1|11|20)$/ ) {$arch = 'Zen'}
+			if ($model =~ /^(1|11|18|20)$/){
+				$arch = 'Zen'}
 			# Seen: stepping 1 is Zen+ Ryzen 7 3750H. But stepping 1 Zen is: Ryzen 3 3200U
 			# Unknown if stepping 0 is Zen or either.
-			elsif ( $model =~ /^(18)$/ ) {
+			elsif ($model =~ /^(18)$/){
 				$arch = 'Zen/Zen+';
 				$note = $check;
 			}
-			elsif ( $model =~ /^(8)$/ ) {$arch = 'Zen+'}
-			# not positive about 2x, main resource shows only listed hex values
+			# shares model 8 with zen, stepping unknown
+			elsif ($model =~ /^(8)$/){
+				$arch = 'Zen+'}
 			# used this but it didn't age well:  ^(2[0123456789ABCDEF]|
-			elsif ( $model =~ /^(31|60|71|90)$/ ) {$arch = 'Zen 2'}
-			# no info on these yet, but they are coming and are scheduled
-			# elsif ( $model =~ /^()$/ ) {$arch = 'Zen 4'}
+			elsif ($model =~ /^(31|47|60|68|71|90)$/){
+				$arch = 'Zen 2'}
 			else {
 				$arch = 'Zen';
 				$note = $check;}
 		}
 		elsif ($family eq '18'){
-			# model #s not known yet
+			# model 0
 			$arch = 'Zen (Hygon Dhyana)';
 		}
 		elsif ($family eq '19'){
-			# unconfirmed: model: 0 20 40 50
+			# model: 1 21 40 50
 			$arch = 'Zen 3';
 		}
 		# note: family 20 may be Zen 4 but not known for sure yet
+		# elsif ($family eq '20'){
+			# model: unknown
+		#	$arch = 'Zen 4';
+		# }
 	}
-	elsif ( $type eq 'arm'){
-		if ($family ne ''){$arch="ARMv$family";}
-		else {$arch='ARM';}
+	elsif ($type eq 'arm'){
+		if ($family ne ''){
+			$arch="ARMv$family";}
+		else {
+			$arch='ARM';}
 	}
-# 	elsif ( $type eq 'ppc'){
+# 	elsif ($type eq 'ppc'){
 # 		$arch='PPC';
 # 	}
 	# aka VIA
-	elsif ( $type eq 'centaur'){ 
+	elsif ($type eq 'centaur'){ 
 		if ($family eq '5'){
-			if ( $model =~ /^(4)$/ ) {$arch = 'WinChip C6'}
-			elsif ( $model =~ /^(8)$/ ) {$arch = 'WinChip 2'}
-			elsif ( $model =~ /^(9)$/ ) {$arch = 'WinChip 3'}
+			if ($model =~ /^(4)$/){
+				$arch = 'WinChip C6'}
+			elsif ($model =~ /^(8)$/){
+				$arch = 'WinChip 2'}
+			elsif ($model =~ /^(9)$/){
+				$arch = 'WinChip 3'}
 		}
 		elsif ($family eq '6'){
-			if ( $model =~ /^(6)$/ ) {$arch = 'WinChip-based'}
-			elsif ( $model =~ /^(7|8)$/ ) {$arch = 'C3'}
-			elsif ( $model =~ /^(9)$/ ) {$arch = 'C3-2'}
-			elsif ( $model =~ /^(A|D)$/ ) {$arch = 'C7'}
-			elsif ( $model =~ /^(F)$/ ) {$arch = 'Isaiah'}
+			if ($model =~ /^(6)$/){
+				$arch = 'WinChip-based'}
+			elsif ($model =~ /^(7|8)$/){
+				$arch = 'C3'}
+			elsif ($model =~ /^(9)$/){
+				$arch = 'C3-2'}
+			elsif ($model =~ /^(A|D)$/){
+				$arch = 'C7'}
+			elsif ($model =~ /^(F)$/){
+				$arch = 'Isaiah'}
 		}
 	}
 	# note, to test uncoment $cpu{'type'} = Elbrus in proc/cpuinfo logic
-	elsif ( $type eq 'elbrus'){ 
+	elsif ($type eq 'elbrus'){ 
 		# E8CB
-	if ($family eq '4'){
-		if ( $model eq '1' ) {$arch = 'Elbrus'}
-		elsif ( $model eq '2' ) {$arch = 'Elbrus-S'}
-		elsif ( $model eq '3' ) {$arch = 'Elbrus-4C'}
-		elsif ( $model eq '4' ) {$arch = 'Elbrus-2C+'}
-		elsif ( $model eq '6' ) {$arch = 'Elbrus-2CM'}
-		elsif ( $model eq '7' ) {
-			if ($stepping >= 2) {$arch = 'Elbrus-8C1';}
-			else {$arch = 'Elbrus-8C';}
-		} # note: stepping > 1 may be 8C1
-		elsif ( $model eq '8' ) {$arch = 'Elbrus-1C+'}
-		# 8C2 morphed out of E8CV, but the two were the same die
-		elsif ( $model eq '9' ) {
-			$arch = 'Elbrus-8CV/8C2';
-			$note = $check;}
-		elsif ( $model eq '10' ) {$arch = 'Elbrus-12C'}
-		elsif ( $model eq '11' ) {$arch = 'Elbrus-16C'}
-		elsif ( $model eq '12' ) {$arch = 'Elbrus-2C3'}
-		else {
-			$arch = 'Elbrus-??';
-			$note = $check;}
-	}
-	elsif ($family eq '5'){
-		if ($model eq '9') {$arch = 'Elbrus-8C2'}
+		if ($family eq '4'){
+			if ($model eq '1'){
+				$arch = 'Elbrus'}
+			elsif ($model eq '2'){
+				$arch = 'Elbrus-S'}
+			elsif ($model eq '3'){
+				$arch = 'Elbrus-4C'}
+			elsif ($model eq '4'){
+				$arch = 'Elbrus-2C+'}
+			elsif ($model eq '6'){
+				$arch = 'Elbrus-2CM'}
+			elsif ($model eq '7'){
+				if ($stepping >= 2){
+					$arch = 'Elbrus-8C1';}
+				else {
+					$arch = 'Elbrus-8C';}
+			} # note: stepping > 1 may be 8C1
+			elsif ($model eq '8'){
+				$arch = 'Elbrus-1C+'}
+			# 8C2 morphed out of E8CV, but the two were the same die
+			elsif ($model eq '9'){
+				$arch = 'Elbrus-8CV/8C2';
+				$note = $check;}
+			elsif ($model eq 'A'){
+				$arch = 'Elbrus-12C'}
+			elsif ($model eq 'B'){
+				$arch = 'Elbrus-16C'}
+			elsif ($model eq 'C'){
+				$arch = 'Elbrus-2C3'}
+			else {
+				$arch = 'Elbrus-??';
+				$note = $check;}
+		}
+		elsif ($family eq '5'){
+			if ($model eq '9'){
+				$arch = 'Elbrus-8C2'}
+			else {
+				$arch = 'Elbrus-??';
+				$note = $check;}
+		}
+		elsif ($family eq '6'){
+			if ($model eq 'A'){
+				$arch = 'Elbrus-12C'}
+			elsif ($model eq 'B'){
+				$arch = 'Elbrus-16C'}
+			elsif ($model eq 'C'){
+				$arch = 'Elbrus-2C3'}
+			else {
+				$arch = 'Elbrus-??';
+				$note = $check;}
+		}
 		else {
 			$arch = 'Elbrus-??';
-			$note = $check;}
-	}
+			$note = $check;
+		}
 	}
-	elsif ( $type eq 'intel'){
+	elsif ($type eq 'intel'){
 		if ($family eq '4'){
-			if ( $model =~ /^(0|1|2|3|4|5|6|7|8|9)$/ ) {$arch = '486'}
+			if ($model =~ /^(0|1|2|3|4|5|6|7|8|9)$/){
+				$arch = '486'}
 		}
 		elsif ($family eq '5'){
-			if ( $model =~ /^(1|2|3|7)$/ ) {$arch = 'P5'}
-			elsif ( $model =~ /^(4|8)$/ ) {$arch = 'P5'} # MMX
-			elsif ( $model =~ /^(9|A)$/ ) {$arch = 'Lakemont'}
+			if ($model =~ /^(1|2|3|7)$/){
+				$arch = 'P5'}
+			elsif ($model =~ /^(4|8)$/){
+				$arch = 'P5'} # MMX
+			elsif ($model =~ /^(9|A)$/){
+				$arch = 'Lakemont'}
 		}
 		elsif ($family eq '6'){
-			if ( $model =~ /^(1)$/ ) {$arch = 'P6 Pro'}
-			elsif ( $model =~ /^(3)$/ ) {$arch = 'P6 II Klamath'}
-			elsif ( $model =~ /^(5)$/ ) {$arch = 'P6 II Deschutes'}
-			elsif ( $model =~ /^(6)$/ ) {$arch = 'P6 II Mendocino'}
-			elsif ( $model =~ /^(7)$/ ) {$arch = 'P6 III Katmai'}
-			elsif ( $model =~ /^(8)$/ ) {$arch = 'P6 III Coppermine'}
-			elsif ( $model =~ /^(9)$/ ) {$arch = 'M Banias'} # pentium M
-			elsif ( $model =~ /^(A)$/ ) {$arch = 'P6 III Xeon'}
-			elsif ( $model =~ /^(B)$/ ) {$arch = 'P6 III Tualitin'}
-			elsif ( $model =~ /^(D)$/ ) {$arch = 'M Dothan'} # Pentium M
-			elsif ( $model =~ /^(E)$/ ) {$arch = 'M Yonah'}
-			elsif ( $model =~ /^(F|16)$/ ) {$arch = 'Core Merom'}
-			elsif ( $model =~ /^(15)$/ ) {$arch = 'M Tolapai'} # pentium M system on chip
-			elsif ( $model =~ /^(17|1D)$/ ) {$arch = 'Penryn'}
-			elsif ( $model =~ /^(1A|1E|1F|25|2C|2E|2F)$/ ) {$arch = 'Nehalem'}
-			elsif ( $model =~ /^(1C|26)$/ ) {$arch = 'Bonnell'} # atom Bonnell? 27?
-			elsif ( $model =~ /^(27|35|36)$/ ) {$arch = 'Saltwell'}
-			elsif ( $model =~ /^(25|2C|2F)$/ ) {$arch = 'Westmere'}
-			elsif ( $model =~ /^(2A|2D)$/ ) {$arch = 'Sandy Bridge'}
-			elsif ( $model =~ /^(37|4A|4D|5A|5D)$/ ) {$arch = 'Silvermont'}
-			elsif ( $model =~ /^(3A|3E)$/ ) {$arch = 'Ivy Bridge'}
-			elsif ( $model =~ /^(3C|3F|45|46)$/ ) {$arch = 'Haswell'}
-			elsif ( $model =~ /^(3D|47|4F|56)$/ ) {$arch = 'Broadwell'}
-			elsif ( $model =~ /^(4C)$/ ) {$arch = 'Airmont'}
-			elsif ( $model =~ /^(4E)$/ ) {$arch = 'Skylake'} 
+			if ($model =~ /^(1)$/){
+				$arch = 'P6 Pro'}
+			elsif ($model =~ /^(3)$/){
+				$arch = 'P6 II Klamath'}
+			elsif ($model =~ /^(5)$/){
+				$arch = 'P6 II Deschutes'}
+			elsif ($model =~ /^(6)$/){
+				$arch = 'P6 II Mendocino'}
+			elsif ($model =~ /^(7)$/){
+				$arch = 'P6 III Katmai'}
+			elsif ($model =~ /^(8)$/){
+				$arch = 'P6 III Coppermine'}
+			elsif ($model =~ /^(9)$/){
+				$arch = 'M Banias'} # pentium M
+			elsif ($model =~ /^(A)$/){
+				$arch = 'P6 III Xeon'}
+			elsif ($model =~ /^(B)$/){
+				$arch = 'P6 III Tualitin'}
+			elsif ($model =~ /^(D)$/){
+				$arch = 'M Dothan'} # Pentium M
+			elsif ($model =~ /^(E)$/){
+				$arch = 'M Yonah'}
+			elsif ($model =~ /^(F|16)$/){
+				$arch = 'Core Merom'}
+			elsif ($model =~ /^(15)$/){
+				$arch = 'M Tolapai'} # pentium M system on chip
+			elsif ($model =~ /^(17|1D)$/){
+				$arch = 'Penryn'}
+			elsif ($model =~ /^(1A|1E|1F|25|2C|2E|2F)$/){
+				$arch = 'Nehalem'}
+			elsif ($model =~ /^(1C|26)$/){
+				$arch = 'Bonnell'} # atom Bonnell? 27?
+			elsif ($model =~ /^(27|35|36)$/){
+				$arch = 'Saltwell'}
+			elsif ($model =~ /^(25|2C|2F)$/){
+				$arch = 'Westmere'}
+			elsif ($model =~ /^(2A|2D)$/){
+				$arch = 'Sandy Bridge'}
+			elsif ($model =~ /^(37|4A|4D|5A|5D)$/){
+				$arch = 'Silvermont'}
+			elsif ($model =~ /^(3A|3E)$/){
+				$arch = 'Ivy Bridge'}
+			elsif ($model =~ /^(3C|3F|45|46)$/){
+				$arch = 'Haswell'}
+			elsif ($model =~ /^(3D|47|4F|56)$/){
+				$arch = 'Broadwell'}
+			elsif ($model =~ /^(4C)$/){
+				$arch = 'Airmont'}
+			elsif ($model =~ /^(4E)$/){
+				$arch = 'Skylake'} 
 			# need to find stepping for these, guessing stepping 4 is last for SL
-			elsif ( $model =~ /^(55)$/ ) {
-				if ($stepping >= 5 && $stepping <= 7){$arch = 'Cascade Lake'}
-				elsif ($stepping >= 8){$arch = 'Cooper Lake'}
-				else {$arch = 'Skylake'} }
-			elsif ( $model =~ /^(57)$/ ) {$arch = 'Knights Landing'}
-			elsif ( $model =~ /^(5C|5F)$/ ) {$arch = 'Goldmont'}
-			elsif ( $model =~ /^(5E)$/ ) {$arch = 'Skylake-S'}
-			elsif ( $model =~ /^(66)$/ ) {$arch = 'Cannon Lake'}
+			elsif ($model =~ /^(55)$/){
+				if ($stepping >= 5 && $stepping <= 7){
+					$arch = 'Cascade Lake'}
+				elsif ($stepping >= 8){
+					$arch = 'Cooper Lake'}
+				else {
+					$arch = 'Skylake'} }
+			elsif ($model =~ /^(57)$/){
+				$arch = 'Knights Landing'}
+			elsif ($model =~ /^(5C|5F)$/){
+				$arch = 'Goldmont'}
+			elsif ($model =~ /^(5E)$/){
+				$arch = 'Skylake-S'}
+			elsif ($model =~ /^(66)$/){
+				$arch = 'Cannon Lake'}
 			# 6 are servers, 7 not
-			elsif ( $model =~ /^(6A|6C|7D|7E)$/ ) {$arch = 'Ice Lake'}
-			elsif ( $model =~ /^(7A)$/ ) {$arch = 'Goldmont Plus'} 
-			elsif ( $model =~ /^(85)$/ ) {$arch = 'Knights Mill'}
-			elsif ( $model =~ /^(86)$/ ) {$arch = 'Tremont'}
-			elsif ( $model =~ /^(8C)$/ ) {$arch = 'Tiger Lake'}
-			elsif ( $model =~ /^(8E)$/ ) {
+			elsif ($model =~ /^(6A|6C|7D|7E)$/){
+				$arch = 'Ice Lake'}
+			elsif ($model =~ /^(7A)$/){
+				$arch = 'Goldmont Plus'} 
+			elsif ($model =~ /^(85)$/){
+				$arch = 'Knights Mill'}
+			elsif ($model =~ /^(8A|96|9C)$/){
+				$arch = 'Tremont'}
+			elsif ($model =~ /^(8C|8D)$/){
+				$arch = 'Tiger Lake'}
+			elsif ($model =~ /^(8E)$/){
 				# can be AmberL or KabyL
 				if ($stepping == 9){
 					$arch = 'Amber/Kaby Lake';
@@ -9011,31 +9991,46 @@ sub cpu_arch {
 					$arch = 'Kaby Lake';
 					$note = $check;} 
 			}
-			elsif ( $model =~ /^(9E)$/ ) {
+			elsif ($model =~ /^(8F)$/){
+				$arch = 'Saphire Rapids'} # server
+			elsif ($model =~ /^(97|9A)$/){
+				$arch = 'Alder Lake';}
+			elsif ($model =~ /^(9E)$/){
 				if ($stepping == 9){
-					$arch = 'Kaby Lake'}
+					$arch = 'Kaby Lake';}
 				elsif ($stepping >= 10 && $stepping <= 13){
 					$arch = 'Coffee Lake'}
 				else {
 					$arch = 'Kaby Lake';
 					$note = $check;} 
 			}
-			elsif ( $model =~ /^(A5)$/ ) {$arch = 'Comet Lake'} # steppings 0-5
+			elsif ($model =~ /^(A5)$/){
+				$arch = 'Comet Lake'} # steppings 0-5
+			elsif ($model =~ /^(A7)$/){
+				$arch = 'Rocket Lake'} 
 			# More info: comet: shares family/model, need to find stepping numbers
-			# Coming: meteor lake; alder lake; cooper lake; granite rapids; rocket lake; saphire rapids; 
+			# Coming: meteor lake; granite rapids; diamond rapids
 		}
 		# itanium 1 family 7 all recalled
 		elsif ($family eq 'B'){
-			if ( $model =~ /^(0)$/ ) {$arch = 'Knights Ferry'}
-			if ( $model =~ /^(1)$/ ) {$arch = 'Knights Corner'}
+			if ($model =~ /^(0)$/){
+				$arch = 'Knights Ferry'}
+			if ($model =~ /^(1)$/){
+				$arch = 'Knights Corner'}
 		}
 		elsif ($family eq 'F'){
-			if ( $model =~ /^(0|1)$/ ) {$arch = 'Netburst Willamette'}
-			elsif ( $model =~ /^(2)$/ ) {$arch = 'Netburst Northwood'}
-			elsif ( $model =~ /^(3)$/ ) {$arch = 'Netburst Prescott'} # 6? Nocona
-			elsif ( $model =~ /^(4)$/ ) {$arch = 'Netburst Smithfield'} # 6? Nocona
-			elsif ( $model =~ /^(6)$/ ) {$arch = 'Netburst Presler'}
-			else {$arch = 'Netburst'}
+			if ($model =~ /^(0|1)$/){
+				$arch = 'Netburst Willamette'}
+			elsif ($model =~ /^(2)$/){
+				$arch = 'Netburst Northwood'}
+			elsif ($model =~ /^(3)$/){
+				$arch = 'Netburst Prescott'} # 6? Nocona
+			elsif ($model =~ /^(4)$/){
+				$arch = 'Netburst Smithfield'} # 6? Nocona
+			elsif ($model =~ /^(6)$/){
+				$arch = 'Netburst Presler'}
+			else {
+				$arch = 'Netburst'}
 		}
 		# this is not going to e accurate, WhiskyL or Kaby L can ID as Skylake
 		# but if it's a new cpu microarch not handled yet, it may give better 
@@ -9054,7 +10049,7 @@ sub cpu_arch {
 
 sub count_alpha {
 	my ($count) = @_;
-	#print "$count\n";
+	# print "$count\n";
 	my @alpha = qw(Single Dual Triple Quad);
 	if ($count > 4){
 		$count .= '-';
@@ -9092,7 +10087,7 @@ sub set_cpu_data {
 # MHZ - cell cpus
 sub speed_cleaner {
 	my ($speed,$opt) = @_;
-	return if ! $speed || $speed eq '0';
+	return if !$speed || $speed eq '0';
 	$speed =~ s/[GMK]HZ$//gi;
 	$speed = ($speed/1000) if $opt && $opt eq 'khz';
 	$speed = sprintf("%.0f", $speed);
@@ -9100,7 +10095,7 @@ sub speed_cleaner {
 }
 sub cpu_cleaner {
 	my ($cpu) = @_;
-	return if ! $cpu;
+	return if !$cpu;
 	my $filters = '@|cpu |cpu deca|([0-9]+|single|dual|two|triple|three|tri|quad|four|';
 	$filters .= 'penta|five|hepta|six|hexa|seven|octa|eight|multi)[ -]core|';
 	$filters .= 'ennea|genuine|multi|processor|single|triple|[0-9\.]+ *[MmGg][Hh][Zz]';
@@ -9111,9 +10106,9 @@ sub cpu_cleaner {
 }
 sub hex_and_decimal {
 	my ($data) = @_; 
-	$data ||= '';
+	$data = '' if !defined $data;
 	if ($data =~ /\S/){
-		$data .=  ' (' . hex($data) . ')' if hex($data) ne $data;
+		$data .= ' (' . hex($data) . ')' if hex($data) ne $data;
 	}
 	else {
 		$data = 'N/A';
@@ -9122,9 +10117,9 @@ sub hex_and_decimal {
 }
 }
 
-## DiskData
+## DriveItem
 {
-package DiskData;
+package DriveItem;
 my ($b_hddtemp,$b_nvme,$smartctl_missing);
 my ($hddtemp,$nvme) = ('','');
 my (@by_id,@by_path,@vendors);
@@ -9136,16 +10131,16 @@ sub get {
 	my ($type) = @_;
 	$type ||= 'standard';
 	my $num = 0;
-	@data = disk_data($type);
+	@data = drive_data($type);
 	# NOTE: 
 	if (@data){
 		if ($type eq 'standard'){
-			push(@rows,totals_output(\@data));
-			push(@rows,drives_output(\@data)) if $show{'disk'} && @data;
-			if ($bsd_type && !@dm_boot_disk && $type eq 'standard' && $show{'disk'} ){
+			push(@rows,storage_output(\@data));
+			push(@rows,drive_output(\@data)) if $show{'disk'} && @data;
+			if ($bsd_type && !$dboot{'disk'} && $type eq 'standard' && $show{'disk'}){
 				$key1 = 'Drive Report';
-				my $file = main::system_files('dmesg-boot');
-				if ( $file && ! -r $file){
+				my $file = $system_files{'dmesg-boot'};
+				if ($file && ! -r $file){
 					$val1 = main::row_defaults('dmesg-boot-permissions');
 				}
 				elsif (!$file){
@@ -9173,16 +10168,16 @@ sub get {
 		$val1 = main::row_defaults('disk-data');
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
 	}
-	#push(@rows,@data);
+	# push(@rows,@data);
 	if ($show{'optical'} || $show{'optical-basic'}){
-		push(@rows,OpticalData::get());
+		push(@rows,OpticalItem::get());
 	}
 	($b_hddtemp,$b_nvme,$hddtemp,$nvme) = (undef,undef,undef,undef);
 	(@by_id,@by_path) = (undef,undef);
 	eval $end if $b_log;
 	return @rows;
 }
-sub totals_output {
+sub storage_output {
 	eval $start if $b_log;
 	my ($disks) = @_;
 	my (@rows);
@@ -9191,14 +10186,14 @@ sub totals_output {
 	push(@rows, {
 	main::key($num++,1,1,'Local Storage') => '',
 	});
-	#print Data::Dumper::Dumper $disks;
+	# print Data::Dumper::Dumper $disks;
 	$size = main::get_size($disks->[0]{'size'},'string','N/A');
 	if ($disks->[0]{'logical-size'}){
 		$rows[$j]->{main::key($num++,1,2,'total')} = '';
 		$rows[$j]->{main::key($num++,0,3,'raw')} = $size;
 		$size = main::get_size($disks->[0]{'logical-size'},'string');
 		$size_value = $disks->[0]{'logical-size'};
-		#print Data::Dumper::Dumper $disks;
+		# print Data::Dumper::Dumper $disks;
 		$rows[$j]->{main::key($num++,1,3,'usable')} = $size;
 	}
 	else {
@@ -9211,7 +10206,7 @@ sub totals_output {
 		$rows[$j]->{main::key($num++,0,4,'lvm-free')} = $size;
 	}
 	if (($size_value && $size_value =~ /^[0-9]/) && 
-		 ($used && $disks->[0]{'used'} =~ /^[0-9]/ )){
+		 ($used && $disks->[0]{'used'} =~ /^[0-9]/)){
 		$used = $used . ' (' . sprintf("%0.1f", $disks->[0]{'used'}/$size_value*100) . '%)';
 	}
 	$rows[$j]->{main::key($num++,0,2,'used')} = $used;
@@ -9219,10 +10214,10 @@ sub totals_output {
 	eval $end if $b_log;
 	return @rows;
 }
-sub drives_output {
+sub drive_output {
 	eval $start if $b_log;
 	my ($disks) = @_;
-	#print Data::Dumper::Dumper $disks;
+	# print Data::Dumper::Dumper $disks;
 	my ($b_smart_permissions,@rows,$smart_age,$smart_basic,$smart_fail);
 	my ($num,$j) = (0,0);
 	my ($id,$model,$size) = ('','','');
@@ -9231,7 +10226,7 @@ sub drives_output {
 		$j = scalar @rows;
 		$rows[$j]->{main::key($num++,0,1,'SMART Message')} = $smartctl_missing;
 	}
-	elsif ($b_admin) {
+	elsif ($b_admin){
 		($smart_age,$smart_basic,$smart_fail) = smartctl_fields();
 	}
 	foreach my $row (sort { $a->{'id'} cmp $b->{'id'} } @$disks){
@@ -9240,7 +10235,7 @@ sub drives_output {
 		$model = ($row->{'model'}) ? $row->{'model'}: 'N/A';
 		$id =  ($row->{'id'}) ? "/dev/$row->{'id'}":'N/A';
 		$size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
-		#print Data::Dumper::Dumper $disks;
+		# print Data::Dumper::Dumper $disks;
 		$j = scalar @rows;
 		if (!$b_smart_permissions && $row->{'smart-permissions'}){
 			$b_smart_permissions = 1;
@@ -9271,7 +10266,7 @@ sub drives_output {
 		}
 		$rows[$j]->{main::key($num++,0,2,'size')} = $size;
 		if ($b_admin && $row->{'block-physical'}){
-			$rows[$j]->{main::key($num++,1,2,'block size')} = '';
+			$rows[$j]->{main::key($num++,1,2,'block-size')} = '';
 			$rows[$j]->{main::key($num++,0,3,'physical')} = $row->{'block-physical'} . ' B';
 			$rows[$j]->{main::key($num++,0,3,'logical')} = ($row->{'block-logical'}) ? $row->{'block-logical'} . ' B' : 'N/A';
 		}
@@ -9282,13 +10277,22 @@ sub drives_output {
 			$rows[$j]->{main::key($num++,0,2,'speed')} = $row->{'speed'};
 			$rows[$j]->{main::key($num++,0,2,'lanes')} = $row->{'lanes'} if $row->{'lanes'};
 		}
-		if ($extra > 2 && ($row->{'rotation'} || $row->{'drive-type'})){
-			$row->{'rotation'} = $row->{'drive-type'} if !$row->{'rotation'};
-			$rows[$j]->{main::key($num++,0,2,'rotation')} = $row->{'rotation'};
+		if ($extra > 2){
+			$row->{'drive-type'} ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'type')} = $row->{'drive-type'};
+			if ($row->{'rotation'}){
+				$rows[$j]->{main::key($num++,0,2,'rpm')} = $row->{'rotation'};
+			}
 		}
 		if ($extra > 1){
-			my $serial = main::apply_filter($row->{'serial'});
-			$rows[$j]->{main::key($num++,0,2,'serial')} = $serial;
+			if (!$row->{'serial'} && $alerts{'bioctl'} && 
+			 $alerts{'bioctl'}->{'action'} eq 'permissions'){
+				$row->{'serial'} = main::row_defaults('root-required');
+			}
+			else {
+				$row->{'serial'} = main::apply_filter($row->{'serial'});
+			}
+			$rows[$j]->{main::key($num++,0,2,'serial')} = $row->{'serial'};
 			if ($row->{'drive-serial'}){
 				$rows[$j]->{main::key($num++,0,2,'drive serial')} = main::apply_filter($row->{'drive-serial'});
 			}
@@ -9302,10 +10306,19 @@ sub drives_output {
 		if ($extra > 0 && $row->{'temp'}){
 			$rows[$j]->{main::key($num++,0,2,'temp')} = $row->{'temp'} . ' C';
 		}
+		if ($extra > 1 && $alerts{'bioctl'}){
+			if (!$row->{'duid'} && $alerts{'bioctl'}->{'action'} eq 'permissions'){
+				$rows[$j]->{main::key($num++,0,2,'duid')} = main::row_defaults('root-required');
+			}
+			elsif ($row->{'duid'}){
+				$rows[$j]->{main::key($num++,0,2,'duid')} = main::apply_filter($row->{'duid'});
+			}
+		}
 		# extra level tests already done
 		if (defined $row->{'partition-table'}){
 			$rows[$j]->{main::key($num++,0,2,'scheme')} = $row->{'partition-table'};
 		}
+		
 		if ($row->{'smart'} || $row->{'smart-error'}){
 			$j = scalar @rows;
 			## Basic SMART and drive info ##
@@ -9357,19 +10370,20 @@ sub smart_output {
 	eval $end if $b_log;
 }
 
-sub disk_data {
+sub drive_data {
 	eval $start if $b_log;
 	my ($type) = @_;
 	my (@rows,@data,@devs);
 	my $num = 0;
 	my ($used) = (0);
-	PartitionData::partition_data() if !$b_partitions;
-	RaidData::raid_data() if !$b_raid;
+	PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+	RaidItem::raid_data() if !$loaded{'raid'};
+	# see docs/inxi-data.txt PARTITION DATA for more on remote/fuse fs
+	my $fs_skip = PartitionItem::fs_excludes('disk-used');
 	foreach my $row (@partitions){
-		# don't count remote used, also, some cases mount 
-		# panfs is parallel NAS volume manager, need more data
-		next if ($row->{'fs'} && $row->{'fs'} =~ /cifs|iso9660|nfs|panfs|sshfs|smbfs|unionfs/);
-		# don't count zfs or file type swap
+		# don't count remote/distributed/union type fs towards used
+		next if ($row->{'fs'} && $row->{'fs'} =~ /^(fuse(blk)?[\._-]?)?($fs_skip)$/);
+		# don't count non partition swap
 		next if ($row->{'swap-type'} && $row->{'swap-type'} ne 'partition');
 		# in some cases, like redhat, mounted cdrom/dvds show up in partition data
 		next if ($row->{'dev-base'} && $row->{'dev-base'} =~ /^sr[0-9]+$/);
@@ -9377,7 +10391,7 @@ sub disk_data {
 		# to same partitions, or btrfs sub volume mounts, is present. The value is 
 		# searched for an earlier appearance of that partition and if it is present, 
 		# the data is not added into the partition used size.
-		if ( $row->{'dev-base'} !~ /^(\/\/|:\/)/ && ! (grep {/$row->{'dev-base'}/} @devs) ){
+		if ($row->{'dev-base'} !~ /^(\/\/|:\/)/ && !(grep {/$row->{'dev-base'}/} @devs)){
 			$used += $row->{'used'} if $row->{'used'};
 			push(@devs, $row->{'dev-base'});
 		}
@@ -9386,17 +10400,17 @@ sub disk_data {
 		@data = proc_data($used);
 	}
 	else {
-		@data = dmesg_boot_data($used);
+		@data = bsd_data($used);
 	}
 	if ($b_admin){
-		if ( $alerts{'smartctl'} && $alerts{'smartctl'}->{'action'} eq 'use'){
+		if ($alerts{'smartctl'} && $alerts{'smartctl'}->{'action'} eq 'use'){
 			@data = smartctl_data(\@data);
 		}
 		else {
-			$smartctl_missing = $alerts{'smartctl'}->{'missing'};
+			$smartctl_missing = $alerts{'smartctl'}->{'message'};
 		}
 	}
-	print Data::Dumper::Dumper \@data if $test[13];;
+	print Data::Dumper::Dumper \@data if $dbg[13];;
 	main::log_data('data',"used: $used") if $b_log;
 	eval $end if $b_log;
 	return @data;
@@ -9406,9 +10420,9 @@ sub proc_data {
 	my ($used) = @_;
 	my (@data,@drives);
 	my ($b_hdx,$logical_size,$size) = (0,0,0);
-	main::set_proc_partitions() if !$bsd_type && !$b_proc_partitions;
+	PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
 	foreach my $row (@proc_partitions){
-		if ( $row->[-1] =~ /^(fio[a-z]+|[hsv]d[a-z]+|(ada|mmcblk|n[b]?d|nvme[0-9]+n)[0-9]+)$/) {
+		if ($row->[-1] =~ /^(fio[a-z]+|[hsv]d[a-z]+|(ada|mmcblk|n[b]?d|nvme[0-9]+n)[0-9]+)$/){
 			$b_hdx = 1 if $row->[-1] =~ /^hd[a-z]/;
 			push(@drives, {
 			'firmware' => '',
@@ -9426,7 +10440,7 @@ sub proc_data {
 		}
 		# See http://lanana.org/docs/device-list/devices-2.6+.txt for major numbers used below
 		# See https://www.mjmwired.net/kernel/Documentation/devices.txt for kernel 4.x device numbers
-		# if ( $row->[0] =~ /^(3|22|33|8)$/ && $row->[1] % 16 == 0 )  {
+		# if ($row->[0] =~ /^(3|22|33|8)$/ && $row->[1] % 16 == 0)  {
 		#	 $size += $row->[2];
 		# }
 		# special case from this data: 8     0  156290904 sda
@@ -9437,9 +10451,9 @@ sub proc_data {
 		# nvme partitions to next nvme, so it only passes the test for the first nvme drive.
 		# note: 66       16 9766436864 sdah ; 65      240 9766436864 sdaf[maybe special case when double letters?
 		# Check /proc/devices for major number matches
-		if ( $row->[0] =~ /^(3|8|22|33|43|6[5-9]|7[12]|12[89]|13[0-5]|179|202|252|253|254|259)$/ && 
-		     $row->[-1] =~ /(mmcblk[0-9]+|n[b]?d[0-9]+|nvme[0-9]+n[0-9]+|fio[a-z]+|[hsv]d[a-z]+)$/ && 
-		     ( $row->[1] % 16 == 0 || $row->[1] % 16 == 8 || $row->[-1] =~ /(nvme[0-9]+n[0-9]+)$/) ) {
+		if ($row->[0] =~ /^(3|8|22|33|43|6[5-9]|7[12]|12[89]|13[0-5]|179|202|252|253|254|259)$/ && 
+		 $row->[-1] =~ /(mmcblk[0-9]+|n[b]?d[0-9]+|nvme[0-9]+n[0-9]+|fio[a-z]+|[hsv]d[a-z]+)$/ && 
+		 ($row->[1] % 16 == 0 || $row->[1] % 16 == 8 || $row->[-1] =~ /(nvme[0-9]+n[0-9]+)$/)){
 			$size += $row->[2];
 		}
 	}
@@ -9457,14 +10471,14 @@ sub proc_data {
 	'size' => $size,
 	'used' => $used,
 	});
-	#print Data::Dumper::Dumper \@data;
+	# print Data::Dumper::Dumper \@data;
 	if ($show{'disk'}){
 		unshift(@drives,@data);
 		# print 'drives:', Data::Dumper::Dumper \@drives;
 		@data = proc_data_advanced($b_hdx,\@drives);
 	}
 	main::log_data('dump','@data',\@data) if $b_log;
-	print Data::Dumper::Dumper \@data if $test[24];
+	print Data::Dumper::Dumper \@data if $dbg[24];
 	eval $end if $b_log;
 	return @data;
 }
@@ -9492,14 +10506,14 @@ sub proc_data_advanced {
 	if ($b_hdx){
 		for ($i = 1; $i < scalar @$drives; $i++){
 			$file = "/proc/ide/$drives->[$i]{'id'}/model";
-			if ( $drives->[$i]{'id'} =~ /^hd[a-z]/ && -e $file){
+			if ($drives->[$i]{'id'} =~ /^hd[a-z]/ && -e $file){
 				$model = main::reader($file,'strip',0);
 				$drives->[$i]{'model'} = $model;
 			}
 		}
 	}
 	# scsi stuff
-	if ($file = main::system_files('scsi')){
+	if ($file = $system_files{'proc-scsi'}){
 		@scsi = scsi_data($file);
 	}
 	# print 'drives:', Data::Dumper::Dumper $drives;
@@ -9507,7 +10521,7 @@ sub proc_data_advanced {
 		#next if $drives->[$i]{'id'} =~ /^hd[a-z]/;
 		($block_type,$firmware,$model,$partition_scheme,
 		$serial,$vendor,$working_path) = ('','','','','','','');
-		#print "$drives->[$i]{'id'}\n";
+		# print "$drives->[$i]{'id'}\n";
 		@disk_data = disk_data_by_id("/dev/$drives->[$i]{'id'}");
 		main::log_data('dump','@disk_data', \@disk_data) if $b_log;
 		if ($drives->[$i]{'id'} =~ /[sv]d[a-z]/){
@@ -9553,10 +10567,10 @@ sub proc_data_advanced {
 		}
 		# note: an entire class of model names gets truncated by /sys so that should be the last 
 		# in priority re tests.
-		elsif ( (!@disk_data || !$disk_data[0] ) && $block_type){
+		elsif ((!@disk_data || !$disk_data[0]) && $block_type){
 			# NOTE: while path ${working_path}vendor exists, it contains junk value, like: ATA
 			$path = "${working_path}model";
-			if ( -r $path){
+			if (-r $path){
 				$model = main::reader($path,'strip',0);
 				$drives->[$i]{'model'} = $model if $model;
 			}
@@ -9571,7 +10585,7 @@ sub proc_data_advanced {
 			$drives->[$i]{'vendor'} = $disk_data[1] if $disk_data[1];
 		}
 		# maybe rework logic if find good scsi data example, but for now use this
-		elsif ($drives->[$i]{'model'} && !$drives->[$i]{'vendor'}) {
+		elsif ($drives->[$i]{'model'} && !$drives->[$i]{'vendor'}){
 			$drives->[$i]{'model'} = main::disk_cleaner($drives->[$i]{'model'});
 			my @device_data = device_vendor($drives->[$i]{'model'},'');
 			$drives->[$i]{'model'} = $device_data[1] if $device_data[1];
@@ -9596,16 +10610,16 @@ sub proc_data_advanced {
 				}
 				else {
 					$path = "${working_path}serial";
-					if ( -r $path){
+					if (-r $path){
 						$serial = main::reader($path,'strip',0);
 						$drives->[$i]{'serial'} = $serial if $serial;
 					}
 				}
-				if ($extra > 2 && !$drives->[$i]{'firmware'} ){
+				if ($extra > 2 && !$drives->[$i]{'firmware'}){
 					my @fm = ('rev','fmrev','firmware_rev'); # 0 ~ default; 1 ~ mmc; 2 ~ nvme
 					foreach my $firmware (@fm){
 						$path = "${working_path}$firmware";
-						if ( -r $path){
+						if (-r $path){
 							$drives->[$i]{'firmware'} = main::reader($path,'strip',0);
 							last;
 						}
@@ -9618,111 +10632,102 @@ sub proc_data_advanced {
 			$pt_cmd = $data[0];
 			$drives->[$i]{'partition-table'} = uc($data[1]) if $data[1];
 			if ($data[2]){
-				$drives->[$i]{'rotation'} = "$data[2] rpm";
+				$drives->[$i]{'rotation'} = $data[2];
 				$drives->[$i]{'drive-type'} = 'HDD';
 			}
-			elsif (($drives->[$i]{'model'} && $drives->[$i]{'model'} =~ /(ssd|flash|nvme|mmc|\bm[\.-]?2\b)/i) ||
-			       ($block_type && ($block_type eq 'mmc' || $block_type eq 'nvme')) ||
-			       # note: this last case could conceivabley be wrong for a spun down HDD
-			       (defined $data[2] && $data[2] eq '0') ){
+			elsif (($block_type && $block_type ne 'sdx') ||
+			       # note: this case could conceivabley be wrong for a spun down HDD
+			       (defined $data[2] && $data[2] eq '0') ||
+			       ($drives->[$i]{'model'} && 
+			        $drives->[$i]{'model'} =~ /(flash|mmc|msata|\bm[\.-]?2\b|nvme|ssd|solid\s?state)/i)){
 				$drives->[$i]{'drive-type'} = 'SSD';
 			}
 		}
 	}
-	# print Data::Dumper::Dumper $drives;
+	main::log_data('dump','$drives',\$drives) if $b_log;
+	print Data::Dumper::Dumper $drives if $dbg[24];
 	eval $end if $b_log;
 	return @$drives;
 }
 # camcontrol identify <device> |grep ^serial (this might be (S)ATA specific)
 # smartcl -i <device> |grep ^Serial
 # see smartctl; camcontrol devlist; gptid status;
-sub dmesg_boot_data {
+sub bsd_data {
 	eval $start if $b_log;
 	my ($used) = @_;
-	my (@data,@drives,@temp);
-	my ($id_holder,$i,$size,$working) = ('',0,0,0);
-	my $file = main::system_files('dmesg-boot');
-	if (@dm_boot_disk){
-		foreach (@dm_boot_disk){
-			my @row = split(/:\s*/, $_);
-			next if ! defined $row[1];
-			if ($id_holder ne $row[0]){
-				$i++ if $id_holder;
-				# print "$i $id_holder $row[0]\n";
-				$id_holder = $row[0];
-			}
-			# no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s 
-			if (! exists $drives[$i]){
-				$drives[$i]->{'id'} = $row[0];
-				$drives[$i]->{'firmware'} = '';
-				$drives[$i]->{'temp'} = '';
-				$drives[$i]->{'type'} = '';
-				$drives[$i]->{'vendor'} = '';
-			}
-			#print "$i\n";
-			if ($bsd_type eq 'openbsd'){
-				if ($row[1] =~ /(^|,\s*)([0-9\.]+[MGTPE][B]?),.*\ssectors$|^</){
-					$working = main::translate_size($2);
-					$size += $working if $working;
-					$drives[$i]->{'size'} = $working;
-				}
-				if ($row[2] && $row[2] =~ /<([^>]+)>/){
-					$drives[$i]->{'model'} = $1 if $1;
-					$drives[$i]->{'type'} = 'removable' if $_ =~ /removable$/;
-					# <Generic-, Compact Flash, 1.00>
-					my $count = ($drives[$i]->{'model'} =~ tr/,//);
-					if ($count && $count > 1){
-						@temp = split(/,\s*/, $drives[$i]->{'model'});
-						$drives[$i]->{'model'} = $temp[1];
-					}
-				}
-				# print "openbsd\n";
-			}
-			else {
-				if ($row[1] =~ /^([0-9]+[KMGTPE][B]?)\s/){
-					$working = main::translate_size($1);
-					$size += $working if $working;
-					$drives[$i]->{'size'} = $working;
-				}
-				if ($row[1] =~ /device$|^</){
-					$row[1] =~ s/\sdevice$//g;
-					$row[1] =~ /<([^>]*)>\s(.*)/;
-					$drives[$i]->{'model'} = $1 if $1;
-					$drives[$i]->{'spec'} = $2 if $2;
-				}
-				if ($row[1] =~ /^Serial\sNumber\s(.*)/){
-					$drives[$i]->{'serial'} = $1;
-				}
-				if ($row[1] =~ /^([0-9\.]+[MG][B]?\/s)/){
-					$drives[$i]->{'speed'} = $1;
-					$drives[$i]->{'speed'} =~ s/\.[0-9]+// if $drives[$i]->{'speed'};
-				}
+	my (@data,@drives,@softraid,@temp);
+	my ($i,$logical_size,$size,$working) = (0,0,0,0);
+	my $file = $system_files{'dmesg-boot'};
+	DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+	# we don't want non dboot disk data from gpart or disklabel
+	if ($file && ! -r $file){
+		$size = main::row_defaults('dmesg-boot-permissions');
+	}
+	elsif (!$file){
+		$size = main::row_defaults('dmesg-boot-missing');
+	}
+	elsif (%disks_bsd){
+		if ($sysctl{'softraid'}){
+			@softraid = map {$_ =~ s/.*\(([^\)]+)\).*/$1/;$_} @{$sysctl{'softraid'}};
+		}
+		foreach my $id (sort keys %disks_bsd){
+			next if !$disks_bsd{$id} || !$disks_bsd{$id}->{'size'};
+			$drives[$i]->{'id'} = $id;
+			$drives[$i]->{'firmware'} = '';
+			$drives[$i]->{'temp'} = '';
+			$drives[$i]->{'type'} = '';
+			$drives[$i]->{'vendor'} = '';
+			$drives[$i]->{'block-logical'} = $disks_bsd{$id}->{'block-logical'};
+			$drives[$i]->{'block-physical'} = $disks_bsd{$id}->{'block-physical'};
+			$drives[$i]->{'partition-table'} = $disks_bsd{$id}->{'scheme'};
+			$drives[$i]->{'serial'} = $disks_bsd{$id}->{'serial'};
+			$drives[$i]->{'size'} = $disks_bsd{$id}->{'size'};
+			# don't count OpenBSD RAID/CRYPTO virtual disks!
+			if ($drives[$i]->{'size'} && (!@softraid || !(grep {$id eq $_} @softraid))){
+				$size += $drives[$i]->{'size'} if $drives[$i]->{'size'};
+			}
+			$drives[$i]->{'spec'} = $disks_bsd{$id}->{'spec'};
+			$drives[$i]->{'speed'} = $disks_bsd{$id}->{'speed'};
+			$drives[$i]->{'type'} = $disks_bsd{$id}->{'type'};
+			# generate the synthetic model/vendor data
+			$drives[$i]->{'model'} = $disks_bsd{$id}->{'model'};
+			if ($drives[$i]->{'model'}){
+				my @device_data = device_vendor($drives[$i]->{'model'},'');
+				$drives[$i]->{'vendor'} = $device_data[0] if $device_data[0];
+				$drives[$i]->{'model'} = $device_data[1] if $device_data[1];
+			}
+			if ($disks_bsd{$id}->{'duid'}){
+				$drives[$i]->{'duid'} = $disks_bsd{$id}->{'duid'};
+			}
+			if ($disks_bsd{$id}->{'partition-table'}){
+				$drives[$i]->{'partition-table'} = $disks_bsd{$id}->{'partition-table'};
 			}
-			$drives[$i]->{'model'} = main::disk_cleaner($drives[$i]->{'model'});
-			my @device_data = device_vendor($drives[$i]->{'model'},'');
-			$drives[$i]->{'vendor'} = $device_data[0] if $device_data[0];
-			$drives[$i]->{'model'} = $device_data[1] if $device_data[1];
+			$i++;
+		}
+		# raw_logical[0] is total of all logical raid/lvm found
+		# raw_logical[1] is total of all components found. If this totally fails,
+		# and we end up with raw logical less than used, give up
+		if (@raw_logical && $size && $raw_logical[0] && 
+		 (!$used || $raw_logical[0] > $used)){
+			$logical_size = ($size - $raw_logical[1] + $raw_logical[0]);
 		}
 		if (!$size){
 			$size = main::row_defaults('data-bsd');
 		}
 	}
-	elsif ( $file && ! -r $file ){
-		$size = main::row_defaults('dmesg-boot-permissions');
-	}
-	elsif (!$file ){
-		$size = main::row_defaults('dmesg-boot-missing');
-	}
 	@data = ({
+	'logical-size' => $logical_size,
+	'logical-free' => $raw_logical[2],
 	'size' => $size,
 	'used' => $used,
 	});
-	#main::log_data('dump','@data',\@data) if $b_log;
-	if ( $show{'disk'} ){
+	#main::log_data('dump','$data',\@data) if $b_log;
+	if ($show{'disk'}){
 		push(@data,@drives);
-		# print 'drives:', Data::Dumper::Dumper \@drives;
+		# print 'data:', Data::Dumper::Dumper \@data;
 	}
-	# print Data::Dumper::Dumper \@data;
+	main::log_data('dump','$data',\@data) if $b_log;
+	print Data::Dumper::Dumper \@data if $dbg[24];
 	eval $end if $b_log;
 	return @data;
 }
@@ -9731,7 +10736,8 @@ sub dmesg_boot_data {
 # make sure to update if fields added in smartctl_data()
 sub smartctl_fields {
 	eval $start if $b_log;
-	my @data = ([ # age
+	my @data = (
+	[ # age
 	['smart-gsense-error-rate-ar','g-sense error rate'],
 	['smart-media-wearout-a','media wearout'],
 	['smart-media-wearout-t','threshold'],
@@ -9810,7 +10816,8 @@ sub smartctl_fields {
 	['smart-unknown-5-w','worst'],
 	['smart-unknown-5-t','threshold'],
 	['smart-unknown-5-f','alert'],
-	]);
+	]
+	);
 	eval $end if $b_log;
 	return @data;
 }
@@ -9819,29 +10826,35 @@ sub smartctl_data {
 	eval $start if $b_log;
 	my ($data) = @_;
 	my ($b_attributes,$b_intel,$b_kingston,$cmd,%holder,$id,@working,@result,@split);
-	my ($splitter,$num,$a,$f,$r,$t,$v,$w,$y) = (':\s*',0,0,8,1,5,3,4,6); # $y is type, $t threashold, etc
+	my ($splitter,$num,$a,$f,$r,$t,$v,$w,$y) = (':\s*',0,0,8,1,5,3,4,6); # $y is type, $t threshold, etc
 	for (my $i = 0; $i < scalar @$data; $i++){
 		next if !$data->[$i]{'id'};
 		($b_attributes,$b_intel,$b_kingston,$splitter,$num,$a,$r) = (0,0,0,':\s*',0,0,1);
 		%holder = ();
-		#print $data->[$i]{'id'},"\n";
+		# print $data->[$i]{'id'},"\n";
 		# m2 nvme failed on nvme0n1 drive id:
 		$id = $data->[$i]{'id'};
 		$id =~ s/n[0-9]+$// if $id =~ /^nvme/;
+		# openbsd needs the 'c' partition, which is the entire disk
+		$id .= 'c' if $bsd_type && $bsd_type eq 'openbsd';
 		$cmd = $alerts{'smartctl'}->{'path'} . " -AHi /dev/" . $id . ' 2>/dev/null';
 		@result = main::grabber("$cmd", '', 'strip');
 		main::log_data('dump','@result', \@result) if $b_log; # log before cleanup
 		@result = grep {!/^(smartctl|Copyright|==)/} @result;
-		print 'Drive:/dev/' . $id . ":\n", Data::Dumper::Dumper\@result if $test[12];
-		if (scalar @result < 4 ){
+		print 'Drive:/dev/' . $id . ":\n", Data::Dumper::Dumper\@result if $dbg[12];
+		if (scalar @result < 5){
 			if (grep {/failed: permission denied/i} @result){
 				$data->[$i]{'smart-permissions'} = main::row_defaults('tool-permissions','smartctl');
 			}
 			elsif (grep {/unknown usb bridge/i} @result){
 				$data->[$i]{'smart-error'} = main::row_defaults('smartctl-usb');
 			}
+			# can come later in output too
 			elsif (grep {/A mandatory SMART command failed/i} @result){
-				$data->[$i]{'smart-error'} = main::row_defaults('smartctl-command-failed');
+				$data->[$i]{'smart-error'} = main::row_defaults('smartctl-command');
+			}
+			elsif (grep {/open device.*Operation not supported by device/i} @result){
+				$data->[$i]{'smart-error'} = main::row_defaults('smartctl-open');
 			}
 			else {
 				$data->[$i]{'smart-error'} = main::row_defaults('tool-unknown-error','smartctl');
@@ -9866,6 +10879,10 @@ sub smartctl_data {
 					$split[$t] = (main::is_numeric($split[$t])) ? int($split[$t]) : 0;
 					$split[$v] = (main::is_numeric($split[$v])) ? int($split[$v]) : 0;
 				}
+				# can occur later in output so retest it here
+				if ($split[$a] =~ /A mandatory SMART command failed/i){
+					$data->[$i]{'smart-error'} = main::row_defaults('smartctl-command');
+				}
 				## DEVICE INFO ##
 				if ($split[$a] eq 'Device Model'){
 					$b_intel = 1 if $split[$r] =~/\bintel\b/i;
@@ -9894,6 +10911,7 @@ sub smartctl_data {
 				elsif ($split[$a] eq 'Rotation Rate'){
 					if ($split[$r] !~ /^Solid/){
 						$data->[$i]{'rotation'} = $split[$r];
+						$data->[$i]{'rotation'} =~ s/\s*rpm$//i;
 						$data->[$i]{'drive-type'} = 'HDD';
 					}
 					else {
@@ -9901,7 +10919,7 @@ sub smartctl_data {
 					}
 				}
 				elsif ($split[$a] eq 'Serial Number'){
-					if ( !$data->[$i]{'serial'}){
+					if (!$data->[$i]{'serial'}){
 						$data->[$i]{'serial'} = $split[$r];
 					}
 					elsif ($data->[$i]{'type'} && $split[$r] ne $data->[$i]{'serial'}){
@@ -9909,15 +10927,15 @@ sub smartctl_data {
 					}
 				}
 				elsif ($split[$a] eq 'SATA Version is'){
-					if ( $split[$r] =~ /SATA ([0-9.]+), ([0-9.]+ [^\s]+)( \(current: ([1-9.]+ [^\s]+)\))?/){
+					if ($split[$r] =~ /SATA ([0-9.]+), ([0-9.]+ [^\s]+)(\(current: ([1-9.]+ [^\s]+)\))?/){
 						$data->[$i]{'sata'} = $1;
 						$data->[$i]{'speed'} = $2 if !$data->[$i]{'speed'};
 					}
 				}
-				# seen both Size and Sizes
-				elsif ($split[$a] =~ /^Sector Sizes?$/ ){
-					if( $data->[$i]{'type'} || !$data->[$i]{'block-logical'} || !$data->[$i]{'block-physical'} ){
-						if ($split[$r] =~ m|^([0-9]+) bytes logical/physical| ){
+				# seen both Size and Sizes. Linux will usually have both, BSDs not physical
+				elsif ($split[$a] =~ /^Sector Sizes?$/){
+					if ($data->[$i]{'type'} || !$data->[$i]{'block-logical'} || !$data->[$i]{'block-physical'}){
+						if ($split[$r] =~ m|^([0-9]+) bytes logical/physical|){
 							$data->[$i]{'block-logical'} = $1;
 							$data->[$i]{'block-physical'} = $1;
 						}
@@ -9934,11 +10952,11 @@ sub smartctl_data {
 						$data->[$i]{'smart'} = $1;
 						$data->[$i]{'smart'} = ($data->[$i]{'smart'} eq 'Unavailable') ? 'no' : 'yes';
 					}
-					elsif ($split[$r] =~ /^(Enabled|Disabled)/ ){
+					elsif ($split[$r] =~ /^(Enabled|Disabled)/){
 						$data->[$i]{'smart-support'} = lc($1);
 					}
 				}
-				elsif ($split[$a] eq 'SMART overall-health self-assessment test result' ){
+				elsif ($split[$a] eq 'SMART overall-health self-assessment test result'){
 					$data->[$i]{'smart-status'} = $split[$r];
 					# seen nvme that only report smart health, not smart support
 					$data->[$i]{'smart'} = 'yes' if !$data->[$i]{'smart'};
@@ -9946,7 +10964,7 @@ sub smartctl_data {
 				
 				## DEVICE CONDITION: temp/read/write/power on/cycles ##
 				# Attributes data fields, sometimes are same syntax as info block:...
-				elsif ( $split[$a] eq 'Power_Cycle_Count' || $split[$a] eq 'Power Cycles' ){
+				elsif ($split[$a] eq 'Power_Cycle_Count' || $split[$a] eq 'Power Cycles'){
 					$data->[$i]{'smart-cycles'} = $split[$r] if $split[$r];
 				}
 				elsif ($split[$a] eq 'Power_On_Hours' || $split[$a] eq 'Power On Hours' ||
@@ -9974,8 +10992,8 @@ sub smartctl_data {
 				}
 				# 'Airflow_Temperature_Cel' like: 29 (Min/Max 14/43) so can't use -1 index
 				# Temperature like 29 Celsisu
-				elsif ( $split[$a] eq 'Temperature_Celsius' || $split[$a] eq 'Temperature' ||
-				  $split[$a] eq 'Airflow_Temperature_Cel' ) {
+				elsif ($split[$a] eq 'Temperature_Celsius' || $split[$a] eq 'Temperature' ||
+				  $split[$a] eq 'Airflow_Temperature_Cel'){
 					if (!$data->[$i]{'temp'} && $split[$r]){
 						$data->[$i]{'temp'} = $split[$r];
 					}
@@ -10058,7 +11076,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Multi_Zone_Error_Rate'){
 					# note: all t values are 0 that I have seen
-					if ( ($split[$v] - $split[$t]) < 50){
+					if (($split[$v] - $split[$t]) < 50){
 						$data->[$i]{'smart-multizone-errors-av'} = $split[$v];
 						$data->[$i]{'smart-multizone-errors-t'} = $split[$v];
 					}
@@ -10087,7 +11105,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Available Spare Threshold'){
 					$split[$r] =~ s/%$//;
-					if ($holder{'spare'} && main::is_numeric($split[$r]) && $split[$r]/$holder{'spare'} > 0.92 ){
+					if ($holder{'spare'} && main::is_numeric($split[$r]) && $split[$r]/$holder{'spare'} > 0.92){
 						$data->[$i]{'smart-available-reserved-space-ar'} = $holder{'spare'};
 						$data->[$i]{'smart-available-reserved-space-t'} = int($split[$r]);
 					}
@@ -10122,7 +11140,7 @@ sub smartctl_data {
 					}
 				}
 				elsif ($split[$a] eq 'Runtime_Bad_Block'){
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-runtime-bad-block-av'} = $split[$v];
 						$data->[$i]{'smart-runtime-bad-block-t'} = $split[$t];
 						$data->[$i]{'smart-runtime-bad-block-f'} = $split[$f] if $split[$f] ne '-';
@@ -10130,7 +11148,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Seek_Error_Rate'){
 					# value 72; threshold either 000 or 30
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-seek-error-rate-av'} = $split[$v];
 						$data->[$i]{'smart-seek-error-rate-t'} = $split[$t];
 						$data->[$i]{'smart-seek-error-rate-f'} = $split[$f] if $split[$f] ne '-';
@@ -10138,7 +11156,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Spin_Up_Time'){
 					# raw will always be > 0 on spinning disks
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-spinup-time-av'} = $split[$v];
 						$data->[$i]{'smart-spinup-time-t'} = $split[$t];
 						$data->[$i]{'smart-spinup-time-f'} = $split[$f] if $split[$f] ne '-';
@@ -10146,7 +11164,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'SSD_Life_Left'){
 					# raw will always be > 0 on spinning disks
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-ssd-life-left-av'} = $split[$v];
 						$data->[$i]{'smart-ssd-life-left-t'} = $split[$t];
 						$data->[$i]{'smart-ssd-life-left-f'} = $split[$f] if $split[$f] ne '-';
@@ -10154,7 +11172,7 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Unused_Rsvd_Blk_Cnt_Tot'){
 					# raw will always be > 0 on spinning disks
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-unused-reserve-block-av'} = $split[$v];
 						$data->[$i]{'smart-unused-reserve-block-t'} = $split[$t];
 						$data->[$i]{'smart-unused-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
@@ -10162,15 +11180,15 @@ sub smartctl_data {
 				}
 				elsif ($split[$a] eq 'Used_Rsvd_Blk_Cnt_Tot'){
 					# raw will always be > 0 on spinning disks
-					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92 ){
+					if ($b_attributes && $split[$v] && $split[$t] && $split[$t]/$split[$v] > 0.92){
 						$data->[$i]{'smart-used-reserve-block-av'} = $split[$v];
 						$data->[$i]{'smart-used-reserve-block-t'} = $split[$t];
 						$data->[$i]{'smart-used-reserve-block-f'} = $split[$f] if $split[$f] ne '-';
 					}
 				}
-				elsif ($b_attributes ){
-					if ( $split[$y] eq 'Pre-fail' && ($split[$f] ne '-' ||
-					 ($split[$t] && $split[$v] && $split[$t]/$split[$v] > 0.92 ))) {
+				elsif ($b_attributes){
+					if ($split[$y] eq 'Pre-fail' && ($split[$f] ne '-' ||
+					 ($split[$t] && $split[$v] && $split[$t]/$split[$v] > 0.92))){
 						$num++;
 						$data->[$i]{'smart-unknown-' . $num . '-a'} = $split[$a];
 						$data->[$i]{'smart-unknown-' . $num . '-v'} = $split[$v];
@@ -10182,7 +11200,7 @@ sub smartctl_data {
 			}
 		}
 	}
-	print Data::Dumper::Dumper $data if $test[19];
+	print Data::Dumper::Dumper $data if $dbg[19];
 	eval $end if $b_log;
 	return @$data;
 }
@@ -10194,9 +11212,9 @@ sub peripheral_data {
 	my ($type) = ('');
 	# print "$id here\n";
 	if (@by_id){
-		foreach (@by_id) {
+		foreach (@by_id){
 			if ("/dev/$id" eq Cwd::abs_path($_)){
-				#print "$id here\n";
+				# print "$id here\n";
 				if (/usb-/i){
 					$type = 'USB';
 				}
@@ -10209,7 +11227,7 @@ sub peripheral_data {
 	}
 	# note: sometimes with wwn- numbering usb does not appear in by-id but it does in by-path
 	if (!$type && @by_path){
-		foreach (@by_path) {
+		foreach (@by_path){
 			if ("/dev/$id" eq Cwd::abs_path($_)){
 				if (/usb-/i){
 					$type = 'USB';
@@ -10238,13 +11256,13 @@ sub disk_data_advanced {
 		if ($program = main::check_program('udevadm')){
 			$return[0] = "$program info -q property -n ";
 		}
-		elsif ($b_root && -e "/lib/udev/udisks-part-id") {
+		elsif ($b_root && -e "/lib/udev/udisks-part-id"){
 			$return[0] = "/lib/udev/udisks-part-id /dev/";
 		}
-		elsif ($b_root && ($program = main::check_program('fdisk'))) {
+		elsif ($b_root && ($program = main::check_program('fdisk'))){
 			$return[0] = "$program -l /dev/";
 		}
-		if (!$return[0]) {
+		if (!$return[0]){
 			$return[0] = 'na'
 		}
 	}
@@ -10269,7 +11287,7 @@ sub disk_data_advanced {
 		}
 		else {
 			foreach (@data){
-				if ( /^(UDISKS_PARTITION_TABLE_SCHEME|ID_PART_TABLE_TYPE)/ ){
+				if (/^(UDISKS_PARTITION_TABLE_SCHEME|ID_PART_TABLE_TYPE)/){
 					my @working = split('=', $_);
 					$return[1] = $working[1];
 				}
@@ -10357,18 +11375,20 @@ sub set_vendors {
 	['(^MKN|Mushkin)','Mushkin','Mushkin',''], # MKNS
 	# MU = Multiple_Flash_Reader too risky: |M[UZ][^L] HD103SI HD start risky
 	# HM320II HM320II
-	['(SAMSUNG|^MCG[0-9]+GC|^MCC|^MCBOE|\bEVO\b|^[GS]2 Portable|^DS20|^[DG]3 Station|^DUO\b|^P3|^[BC]GN|^[CD]JN|^BJ[NT]|^[BC]WB|^(HM|SP)[0-9]{2}|^MZMPC|^HD[0-9]{3}[A-Z]{2}$|SV[0-9]|E[A-Z][1-9]QT|YP\b)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
+	['(SAMSUNG|^MCG[0-9]+GC|^MCC|^MCBOE|\bEVO\b|^[GS]2 Portable|^DS20|^[DG]3 Station|^DUO\b|^P3|^[BC]GN|^[CD]JN|^BJ[NT]|^[BC]WB|^(HM|SP)[0-9]{2}|^MZMPC|^HD[0-9]{3}[A-Z]{2}$|^G[CD][1-9][QS]|^M[AB]G[0-9][FG]|SV[0-9]|[BE][A-Z][1-9]QT|YP\b)','SAMSUNG','Samsung',''], # maybe ^SM, ^HM
 	# Android UMS Composite?
-	['(SanDisk|^SDS[S]?[DQ]|^D[AB]4|^SL([0-9]+)G|^AFGCE|^ABLCD|^SDW[1-9]|^SEM[1-9]|^U3\b|^SU[0-9]|^DX[1-9]|ULTRA\s(FIT|trek)|Clip Sport|Cruzer|^Extreme|iXpand)','SanDisk','SanDisk',''],
+	['(SanDisk|^SDS[S]?[DQ]|^D[AB]4|^SL([0-9]+)G|^AFGCE|^ABLCD|^SDW[1-9]|^SEM[1-9]|^U3\b|^SU[0-9]|^DX[1-9]|^S[CD][0-9]{2}G|ULTRA\s(FIT|trek)|Clip Sport|Cruzer|^Extreme|iXpand|SSD (Plus|U100) [1-9])','SanDisk','SanDisk',''],
 	# these are HP/Sandisk cobranded. DX110064A5xnNMRI ids as HP and Sandisc
 	['(^DX[1-9])','^(HP\b|SANDDISK)','Sandisk/HP',''], # ssd drive, must come before seagate ST test
 	# real, SSEAGATE Backup+; XP1600HE30002 | 024 HN (spinpoint) ; possible usb: 24AS
-	['(^ST[^T]|[S]?SEAGATE|^X[AFP]|^5AS|^BUP|Expansion Desk|^Expansion|FreeAgent|GoFlex|Backup(\+|\s?Plus)\s?(Hub)?|OneTouch|Slim\s? BK)','[S]?SEAGATE','Seagate',''], 
-	['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|MD0|M000|EARX|EFRX|\d*EAVS|0JD|JP[CV]|[0-9]+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|3200[AB]|2500[BJ]|EA[A-Z]S|20G2|5000[AB]|6400[AB]|7500[AB]|i HTS|00[ABL][A-Z]{2})','(^WDC|Western\s?Digital)','Western Digital',''],
+	# ST[numbers] excludes other ST starting devices
+	['(^(ATA\s)?ST[0-9]{2}|[S]?SEAGATE|^X[AFP]|^5AS|^BUP|Expansion Desk|^Expansion|FreeAgent|GoFlex|Backup(\+|\s?Plus)\s?(Hub)?|OneTouch|Slim\s? BK)','[S]?SEAGATE','Seagate',''], 
+	['^(WD|WL[0]9]|Western Digital|My (Book|Passport)|\d*LPCX|Elements|easystore|MD0|M000|EARX|EFRX|\d*EAVS|0JD|JP[CV]|[0-9]+(BEV|(00)?AAK|AAV|AZL|EA[CD]S)|3200[AB]|2500[BJ]|EA[A-Z]S|20G2|5000[AB]|6400[AB]|7500[AB]|i HTS|00[ABL][A-Z]{2}|EZRX)','(^WDC|Western\s?Digital)','Western Digital',''],
 	# rare cases WDC is in middle of string
-	['(\bWDC\b)','','Western Digital',''],
+	['(\bWDC\b|1002FAEX)','','Western Digital',''],
 	## THEN BETTER KNOWN ONESs ##
-	['^(A-?DATA|AX[MN]|CH11|HV[1-9]|IM2|HD[1-9]|HDD\s?CH|IUM)','^A-?DATA','A-Data',''],
+	# A-Data can be in middle of string
+	['^(.*\bA-?DATA|ASP[0-9]|AX[MN]|CH11|HV[1-9]|IM2|HD[1-9]|HDD\s?CH|IUM)','A-?DATA','A-Data',''],
 	['^ASUS','^ASUS','ASUS',''],
 	# ATCS05 can be hitachi travelstar but not sure
 	['^ATP','^ATP\b','ATP',''],
@@ -10379,9 +11399,9 @@ sub set_vendors {
 	['^(MAB[0-9])','^(HP\b|FUJITSU)','Fujitsu/HP',''],
 	# note: 2012:  wdc bought hgst
 	['^(HGST|Touro|54[15]0|7250)','^HGST','HGST (Hitachi)',''], # HGST HUA
-	['^(Hitachi|HCS|HD[PST]|DK[0-9]|IC|HT|HU|HMS|HDE|0G[0-9])','^Hitachi','Hitachi',''], 
+	['^((ATA\s)?Hitachi|HCS|HD[PST]|DK[0-9]|IC|HT|HU|HMS|HDE|0G[0-9])','Hitachi','Hitachi',''], 
 	# vb: VB0250EAVER but clashes with vbox; HP_SSD_S700_120G ;GB0500EAFYL GB starter too generic?
-	['^(HP\b|[MV]B[0-6]|G[BJ][0-9]|DF[0-9]|F[BK]|0-9]|PSS|XR[0-9]{4}|c350|v[0-9]{3}[bgorw]$|x[0-9]{3}[w]$)','^HP','HP',''], 
+	['^(HP\b|[MV]B[0-6]|G[BJ][0-9]|DF[0-9]|F[BK]|0-9]|PSS|XR[0-9]{4}|c350|v[0-9]{3}[bgorw]$|x[0-9]{3}[w]$|VK0)','^HP','HP',''], 
 	['^(Lexar|LSD|JumpDrive|JD\s?Firefly|WorkFlow)','^Lexar','Lexar',''], # mmc-LEXAR_0xb016546c; JD Firefly;
 	# OCZSSD2-2VTXE120G is OCZ-VERTEX2_3.5
 	['^(OCZ|APOC|D2|DEN|DEN|DRSAK|EC188|FTNC|GFGC|MANG|MMOC|NIMC|NIMR|PSIR|RALLY2|TALOS2|TMSC|TRSAK)','^OCZ[\s-]','OCZ',''],
@@ -10390,20 +11410,23 @@ sub set_vendors {
 	['^PIONEER','^PIONEER','Pioneer',''],
 	['^(PNY|Hook\s?Attache|SSD2SC|(SSD7?)?EP7)','^PNY\s','PNY','','^PNY'],
 	# note: get rid of: M[DGK] becasue mushkin starts with MK
-	# note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB
-	['(^[S]?TOS|^THN|TOSHIBA|TransMemory|^M[GKQ][0-9]|KBG4)','[S]?TOSHIBA','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_
+	# note: seen: KXG50ZNV512G NVMe TOSHIBA 512GB | THNSN51T02DUK NVMe TOSHIBA 1024GB 
+	['(^[S]?TOS|^THN|TOSHIBA|TransMemory|^M[GKQ][0-9]|KBG4|^HDW|^SA[0-9]{2}G$|^(008|016|032|064|128)G[379E][0-9A]$)','[S]?TOSHIBA','Toshiba',''], # scsi-STOSHIBA_STOR.E_EDITION_
 	## LAST: THEY ARE SHORT AND COULD LEAD TO FALSE ID, OR ARE UNLIKELY ##
 	# unknown: AL25744_12345678; ADP may be usb 2.5" adapter; udisk unknown: Z1E6FTKJ 00AAKS
 	# SSD2SC240G726A10 MRS020A128GTS25C EHSAJM0016GB
 	['^5ACE','^5ACE','5ACE',''], # could be seagate: ST316021 5ACE
+	['^(Aarvex|AX[0-9]{2})','^AARVEX','AARVEX',''],
 	['^(AbonMax|ASU[0-9])','^AbonMax','AbonMax',''],
 	['^Acasis','^Acasis','Acasis (hub)',''],
 	['^Acclamator','^Acclamator','Acclamator',''],
 	['^(Actions|HS USB Flash)','^Actions','Actions',''],
 	['^Addlink','^Addlink','Addlink',''],
 	['^(ADplus|SuperVer\b)','^ADplus','ADplus',''],
-	['^ADTRON','^(ADTRON)','Adtron',''],
+	['^ADTRON','^ADTRON','Adtron',''],
 	['^(Advantech|SQF)','^Advantech','Advantech',''],
+	['^AEGO','^AEGO','AEGO',''],
+	['^AFOX','^AFOX','AFOX',''],
 	['^(Agile|AGI)','^(AGI|Agile\s?Gear\s?Int[a-z]*)','AGI',''],
 	['^Aireye','^Aireye','Aireye',''],
 	['^Alcatel','^Alcatel','Alcatel',''],
@@ -10421,14 +11444,15 @@ sub set_vendors {
 	['^(ASM|2115)','^ASM','ASMedia',''],#asm1153e
 	['^(AVEXIR|AVSSD)','^AVEXIR','Avexir',''],
 	['^Axiom','^Axiom','Axiom',''],
+	['^Bamba','^Bamba','Bamba',''],
 	['^Bell\b','^Bell','Packard Bell',''],
 	['^(BelovedkaiAE|GhostPen)','^BelovedkaiAE','BelovedkaiAE',''],
 	['^BHT','^BHT','BHT',''],
-	['^(Big\s?Reservoir|BG\b)','^Big\s?Reservoir','Big Reservoir',''],
+	['^(Big\s?Reservoir|B[RG][_\s-])','^Big\s?Reservoir','Big Reservoir',''],
 	['^BIOSTAR','^BIOSTAR','Biostar',''],
 	['^BIWIN','^BIWIN','BIWIN',''],
 	['^Blackpcs','^Blackpcs','Blackpcs',''],
-	['^(MyDigitalSSD|BP4)','^MyDigitalSSD','MyDigitalSSD',''], # BP4 = BulletProof4
+	['^Bory','^Bory','Bory',''],
 	['^Braveeagle','^Braveeagle','BraveEagle',''],
 	['^(BUFFALO|BSC)','^BUFFALO','Buffalo',''], # usb: BSCR05TU2
 	['^Bulldozer','^Bulldozer','Bulldozer',''],
@@ -10437,6 +11461,7 @@ sub set_vendors {
 	['^(Canon|MP49)','^Canon','Canon',''],
 	['^Centerm','^Centerm','Centerm',''],
 	['^(Centon|DS pro)','^Centon','Centon',''],
+	['^(CFD|CSSD)','^CFD','CFD',''],
 	['^(Chipsbank|CHIPSBNK)','^Chipsbank','Chipsbank',''],
 	['^CHN\b','','Zheino',''],
 	['^Clover','^Clover','Clover',''],
@@ -10459,11 +11484,15 @@ sub set_vendors {
 	['^DGM','^DGM\b','DGM',''],
 	['^Digifast','^Digifast','Digifast',''],
 	['^DIGITAL\s?FILM','DIGITAL\s?FILM','Digital Film',''],
+	['^Dikom','^Dikom','Dikom',''],
+	['^Disain','^Disain','Disain',''],
 	['^(Disney|PIX[\s]?JR)','^Disney','Disney',''],
 	['^(Doggo|DQ-|Sendisk|Shenchu)','^(doggo|Sendisk(.?Shenchu)?|Shenchu(.?Sendisk)?)','Doggo (SENDISK/Shenchu)',''],
-	['^(Dogfish|Shark)','^Dogfish(\s*Technology)?','Dogfish Technolgy',''],
+	['^(Dogfish|Shark)','^Dogfish(\s*Technology)?','Dogfish Technology',''],
 	['^DragonDiamond','^DragonDiamond','DragonDiamond',''],
 	['^DREVO\b','^DREVO','Drevo',''],
+	['^DREVO\b','^DREVO','Drevo',''],
+	['^(Dynabook|AE[1-3]00)','^Dynabook','Dynabook',''],
 	# DX1100 is probably sandisk, but could be HP, or it could be hp branded sandisk
 	['^(Eaget|V8$)','^Eaget','Eaget',''],
 	['^EDGE','^EDGE','EDGE Tech',''],
@@ -10471,10 +11500,12 @@ sub set_vendors {
 	['^Eluktro','^Eluktronics','Eluktronics',''],
 	['^Emperor','^Emperor','Emperor',''],
 	['^Emtec','^Emtec','Emtec',''],
+	['^ENE\b','^ENE','ENE',''],
 	['^Energy','^Energy','Energy',''],
 	['^eNova','^eNOVA','eNOVA',''],
 	['^Epson','^Epson','Epson',''],
 	['^(Etelcom|SSD051)','^Etelcom','Etelcom',''],
+	['^EURS','^EURS','EURS',''],
 	# NOTE: ESA3... may be IBM PCIe SAD card/drives
 	['^(EXCELSTOR|r technology)','^EXCELSTOR( TECHNO(LOGY)?)?','ExcelStor',''],
 	['^EZLINK','^EZLINK','EZLINK',''],
@@ -10486,14 +11517,18 @@ sub set_vendors {
 	['^Fordisk','^Fordisk','Fordisk',''],
 	# FK0032CAAZP/FB160C4081 FK or FV can be HP but can be other things
 	['^FORESEE','^FORESEE','ForeseSU04Ge',''],
+	['^Founder','^Founder','Founder',''],
 	['^(FOXLINE|FLD)','^FOXLINE','Foxline',''], # russian vendor?
 	['^(GALAX\b|Gamer\s?L)','^GALAX','GALAX',''],
 	['^Galaxy\b','^Galaxy','Galaxy',''],
 	['^(Garmin|Fenix|Nuvi|Zumo)','^Garmin','Garmin',''],
 	['^Geil','^Geil','Geil',''],
+	['^GelL','^GelL','GelL',''], # typo for Geil? GelL ZENITH R3 120GB
 	['^(Generic|UY[67])','^Generic','Generic',''],
+	['^Getrich','^Getrich','Getrich',''],
 	['^Gigabyte','^Gigabyte','Gigabyte',''], # SSD
 	['^Gigastone','^Gigastone','Gigastone',''],
+	['^Gigaware','^Gigaware','Gigaware',''],
 	['^Gloway','^Gloway','Gloway',''],
 	['^Goldendisk','^Goldendisk','Goldendisk',''],
 	['^Goldenfir','^Goldenfir','Goldenfir',''],
@@ -10502,6 +11537,7 @@ sub set_vendors {
 	# supertalent also has FM: |FM
 	['^(G[\.]?SKILL)','^G[\.]?SKILL','G.SKILL',''],
 	['^G[\s-]*Tech','^G[\s-]*Technology','G-Technology',''],
+	['^(Hajaan|HS[1-9])','^Haajan','Haajan',''],
 	['^Haizhide','^Haizhide','Haizhide',''],
 	['^(Hama|FlashPen\s?Fancy)','^Hama','Hama',''],
 	['^HDC','^HDC\b','HDC',''],
@@ -10515,17 +11551,18 @@ sub set_vendors {
 	['^(IBM|DT|ESA[1-9])','^IBM','IBM',''], 
 	['^IEI Tech','^IEI Tech(\.|nology)?( Corp(\.|oration)?)?','IEI Technology',''],
 	['^(Imation|Nano\s?Pro|HQT)','^Imation(\sImation)?','Imation',''], # Imation_ImationFlashDrive; TF20 is imation/tdk
+	['^(Inateck|FE20)','^Inateck','Inateck',''],
 	['^(Inca\b|Npenterprise)','^Inca','Inca',''],
 	['^(Indilinx|IND-)','^Indilinx','Indilinx',''],
 	['^INDMEM','^INDMEM','INDMEM',''],
 	['^Inland','^Inland','Inland',''],
-	['^(InnoDisk|Innolite)','^InnoDisk( Corp.)?','InnoDisk',''],
-	['^Innostor','^Innostor','Innostor',''],
-	['^Innovation','^Innovation(\s*IT)?','Innovation IT',''],
+	['^(InnoDisk|Innolite|SATA\s?Slim)','^InnoDisk( Corp.)?','InnoDisk',''],
+	['Innostor','Innostor','Innostor',''],
+	['(^Innovation|Innovation\s?IT)','Innovation(\s*IT)?','Innovation IT',''],
 	['^Innovera','^Innovera','Innovera',''],
 	['^Intaiel','^Intaiel','Intaiel',''],
 	['^(INM|Integral|V\s?Series)','^Integral(\s?Memory)?','Integral Memory',''],
-	['^(lntenso|Intenso|(Alu|Basic|Business|Micro|Mobile|Rainbow|Speed|Twister|Ultra) Line|Rainbow)','^Intenso','Intenso',''],
+	['^(lntenso|Intenso|(Alu|Basic|Business|Micro|c?Mobile|Premium|Rainbow|Slim|Speed|Twister|Ultra) Line|Rainbow)','^Intenso','Intenso',''],
 	['^(Iomega|ZIP\b|Clik!)','^Iomega','Iomega',''], 
 	['^JingX','^JingX','JingX',''], #JingX 120G SSD - not confirmed, but guessing
 	['^Jingyi','^Jingyi','Jingyi',''],
@@ -10533,16 +11570,18 @@ sub set_vendors {
 	['^JMicron','^JMicron(\s?Tech(nology)?)?','JMicron Tech',''], #JMicron H/W raid
 	['^KimMIDI','^KimMIDI','KimMIDI',''],
 	['^Kimtigo','^Kimtigo','Kimtigo',''],
+	['^Kingbank','^Kingbank','Kingbank',''],
 	['^Kingchux[\s-]?ing','^Kingchux[\s-]?ing','Kingchuxing',''],
 	['^(KingDian|NGF)','^KingDian','KingDian',''],
 	['^Kingfast','^Kingfast','Kingfast',''],
 	['^KingMAX','^KingMAX','KingMAX',''],
 	['^Kingrich','^Kingrich','KingrSU04Gich',''],
-	['^KING\s?SHARE','^KING\s?SHARE','KingShare',''],
-	['^(KingSpec|ACSC|KS[DQ]|NT-[0-9]|P4\b|PA18)','^KingSpec','KingSpec',''],
+	['KING\s?SHA\s?RE','KING\s?SHA\s?RE','KingShare',''],
+	['^(KingSpec|ACSC|KS[DQ]|N[ET]-[0-9]|P4\b|PA18|T-(3260|64|128))','^KingSpec','KingSpec',''],
 	['^KingSSD','^KingSSD','KingSSD',''],
 	# kingwin docking, not actual drive
 	['^(EZD|EZ-Dock)','','Kingwin Docking Station',''],
+	['^Kingwin','^Kingwin','Kingwin',''],
 	['(KIOXIA|^K[BX]G[0-9])','KIOXIA','KIOXIA',''], # company name comes after product ID
 	['^KLEVV','^KLEVV','KLEVV',''],
 	['^Kodak','^Kodak','Kodak',''],
@@ -10551,19 +11590,23 @@ sub set_vendors {
 	['^(Lacie|P92|itsaKey|iamaKey)','^Lacie','LaCie',''],
 	['^LANBO','^LANBO','LANBO',''],
 	['^LANTIC','^LANTIC','Lantic',''],
+	['^(Lazos|L-?ISS)','^Lazos','Lazos',''],
 	['^LDLC','^LDLC','LDLC',''],
 	# LENSE30512GMSP34MEAT3TA / UMIS RPITJ256PED2MWX
 	['^(LEN|UMIS)','^Lenovo','Lenovo',''],
 	['^RPFT','','Lenovo O.E.M.',''],
+	# JAJS300M120C JAJM600M256C JAJS600M1024C JAJS600M256C
+	['^(Leven|JAJ[MS][1-9])','^Leven','Leven',''],
 	['^LG\b','^LG','LG',''],
-	['^(LITE[-\s]?ON[\s-]?IT)','^LITE[-]?ON[\s-]?IT','LITE-ON IT',''], # LITEONIT_LSS-24L6G
-	['^(LITE[-\s]?ON|PH[1-9])','^LITE[-]?ON','LITE-ON',''], # PH6-CE240-L
+	['(LITE[-\s]?ON[\s-]?IT)','LITE[-]?ON[\s-]?IT','LITE-ON IT',''], # LITEONIT_LSS-24L6G
+	['(LITE[-\s]?ON|^PH[1-9])','LITE[-]?ON','LITE-ON',''], # PH6-CE240-L; CL1-3D256-Q11 NVMe LITEON 256GB
 	['^LONDISK','^LONDISK','LONDISK',''],
 	['^(LSI|MegaRAID)','^LSI\b','LSI',''],
 	['^(M-Systems|DiskOnKey)','^M-Systems','M-Systems',''],
 	['^(Mach\s*Xtreme|MXSSD|MXU)','^Mach\s*Xtreme','Mach Xtreme',''],
 	['^Maximus','^Maximus','Maximus',''],
-	['^(MAXTOR|Atlas|TM[0-9]{4}|[KL]0[1-9]|Y[0-9]{3}[A-Z])','^MAXTOR','Maxtor',''], # note M2 M3 is usually maxtor, but can be samsung
+	['^Maxone','^Maxone','Maxone',''],
+	['^(MAXTOR|Atlas|TM[0-9]{4}|[KL]0[1-9]|Y[0-9]{3}[A-Z]|STM[0-9]|F[0-9]{3}L)','^MAXTOR','Maxtor',''], # note M2 M3 is usually maxtor, but can be samsung
 	['^(Memorex|TravelDrive|TD\s?Classic)','^Memorex','Memorex',''],
 	# note: C300/400 can be either micron or crucial, but C400 is M4 from crucial
 	['(^MT|^M5|^Micron|00-MT|C[34]00)','^Micron','Micron',''],# C400-MTFDDAK128MAM
@@ -10590,16 +11633,19 @@ sub set_vendors {
 	['^Moweek','^Moweek','Moweek',''],
 	#MRMAD4B128GC9M2C
 	['^(MRMA|Memoright)','^Memoright','Memoright',''],
-	['^MTASE','^MTASE','MTASE',''],
 	['^MSI\b','^MSI\b','MSI',''],
+	['^MTASE','^MTASE','MTASE',''],
 	['^MTRON','^MTRON','MTRON',''],
+	['^(MyDigitalSSD|BP4)','^MyDigitalSSD','MyDigitalSSD',''], # BP4 = BulletProof4
 	['^(Neo\s*Forza|NFS[0-9])','^Neo\s*Forza','Neo Forza',''],
 	['^Netac','^Netac','Netac',''],
 	# NGFF is a type, like msata, sata
 	['^Nik','^Nikimi','Nikimi',''],
+	['^NOREL','^NOREL(SYS)?','NorelSys',''],
+	['^Olympus','^Olympus','Olympus',''],
 	['^Orico','^Orico','Orico',''],
 	['^OSC','^OSC\b','OSC',''],
-	['^OWC','^OWC\b','OWC',''],
+	['^(OWC|Aura)','^OWC\b','OWC',''],
 	['^oyunkey','^oyunkey','Oyunkey',''],
 	['^PALIT','PALIT','Palit',''], # ssd 
 	['^Panram','^Panram','Panram',''], # ssd 
@@ -10607,7 +11653,7 @@ sub set_vendors {
 	['^(Pasoul|OASD)','^Pasoul','Pasoul',''],
 	['^(Patriot|PS[8F]|VPN|Viper)','^Patriot([-\s]?Memory)?','Patriot',''],#Viper M.2 VPN100
 	['^PERC\b','','Dell PowerEdge RAID Card',''], # ssd 
-	['PHISON[\s-]?','PHISON[\s-]?','Phison',''],# E12-256G-PHISON-SSD-B3-BB1
+	['(PHISON[\s-]?|ESR[0-9])','PHISON[\s-]?','Phison',''],# E12-256G-PHISON-SSD-B3-BB1
 	['^Pioneer','Pioneer','Pioneer',''],
 	['^(PLEXTOR|PX-)','^PLEXTOR','Plextor',''],
 	['^(PQI|Intelligent\s?Stick|Cool\s?Drive)','^PQI','PQI',''],
@@ -10617,8 +11663,10 @@ sub set_vendors {
 	['QEMU','^[0-9]*QEMU( QEMU)?','QEMU',''], # 0QUEMU QEMU HARDDISK
 	['(^Quantum|Fireball)','^Quantum','Quantum',''],
 	['^QUMO','^QUMO','Qumo',''],
-	['^(R3|AMD\s?(RADEON)?)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd 
+	['^(R[3-9]|AMD\s?(RADEON)?|Radeon)','AMD\s?(RADEON)?','AMD Radeon',''], # ssd 
 	['^(Ramaxel|RT|RM|RPF|RDM)','^Ramaxel','Ramaxel',''],
+	['^(Ramsta|R[1-9])','^Ramsta','Ramsta',''],
+	['^(Realtek|RTL)','^Realtek','Realtek',''],
 	['^RENICE','^RENICE','Renice',''],
 	['^RevuAhn','^RevuAhn','RevuAhn',''],
 	['^(Ricoh|R5)','^Ricoh','Ricoh',''],
@@ -10638,6 +11686,7 @@ sub set_vendors {
 	['^(SILICON\s?MOTION|SM[0-9])','^SILICON\s?MOTION','Silicon Motion',''],
 	['(Silicon[\s-]?Power|^SP[CP]C|^Silicon|^Diamond|^HasTopSunlightpeed)','Silicon[\s-]?Power','Silicon Power',''],
 	['^SINTECHI?','^SINTECHI?','SinTech (adapter)',''],
+	['^SiS\b','^SiS','SiS',''],
 	['Smartbuy','\s?Smartbuy','Smartbuy',''], # SSD Smartbuy 60GB; mSata Smartbuy 3
 	# HFS128G39TND-N210A; seen nvme with name in middle
 	['(SK\s?HYNIX|^HF[MS]|^H[BC]G)','\s?SK\s?HYNIX','SK Hynix',''], 
@@ -10650,6 +11699,7 @@ sub set_vendors {
 	['^STE[CK]','^STE[CK]','sTec',''], # wd bought this one
 	['^STmagic','^STmagic','STmagic',''],
 	['^STORFLY','^STORFLY','StorFly',''],
+	['\dSUN\d','^SUN(\sMicrosystems)?','Sun Microsystems',''],
 	['^SUNEAST','^SUNEAST','SunEast',''],
 	['^SuperSSpeed','^SuperSSpeed','SuperSSpeed',''],
 	# NOTE: F[MNETU] not reliable, g.skill starts with FM too: 
@@ -10670,15 +11720,17 @@ sub set_vendors {
 	['^Tele2','^Tele2','Tele2',''],
 	['^Teleplan','^Teleplan','Teleplan',''],
 	['^TEUTONS','^TEUTONS','TEUTONS',''],
+	['^THU','^THU','THU',''],
 	['^Tigo','^Tigo','Tigo',''],
 	['^Timetec','^Timetec','Timetec',''],
 	['^TKD','^TKD','TKD',''],
 	['^TopSunligt','^TopSunligt','TopSunligt',''], # is this a typo? hard to know
 	['^TopSunlight','^TopSunlight','TopSunlight',''],
 	['^TOROSUS','^TOROSUS','Torosus',''],
-	['^([F]?TS|Transcend|JetDrive|JetFlash|USDU)','^Transcend','Transcend',''], 
+	['^([F]?TS|Transcend|JetDrive|JetFlash|USDU|EZEX)','^Transcend','Transcend',''], 
 	['^(TrekStor|DS (maxi|pocket)|DataStation)','^TrekStor','TrekStor',''],
 	['^(TwinMOS|TW[0-9])','^TwinMOS','TwinMOS',''],
+	# note: udisk means usb disk, it's not a vendor ID
 	['^UDinfo','^UDinfo','UDinfo',''],
 	['^USBTech','^USBTech','USBTech',''],
 	['^(UNIC2)','^UNIC2','UNIC2',''],
@@ -10687,7 +11739,7 @@ sub set_vendors {
 	['^(OOS[1-9]|Utania)','Utania','Utania',''],
 	['^U-TECH','U-TECH','U-Tech',''],
 	['^VBOX','','VirtualBox',''],
-	['^(Verbatim|STORE N GO|Vi[1-9]|OTG\s?Tiny)','^Verbatim','Verbatim',''],
+	['^(Verbatim|STORE\s?\'?N\'?\s?(FLIP|GO)|Vi[1-9]|OTG\s?Tiny)','^Verbatim','Verbatim',''],
 	['^V-GEN','^V-GEN','V-Gen',''],
 	['^(Victorinox|Swissflash)','^Victorinox','Victorinox',''],
 	['^(Visipro|SDVP)','^Visipro','Visipro',''],
@@ -10695,12 +11747,15 @@ sub set_vendors {
 	['^VMware','^VMware','VMware',''],
 	['^(Vseky|Vaseky)','^Vaseky','Vaseky',''], # ata-Vseky_V880_350G_
 	['^(Walgreen|Infinitive)','^Walgreen','Walgreen',''],
+	['^Walton','^Walton','Walton',''],
+	['^(Wearable|Air-?Stash)','^Wearable','Wearable',''],
 	['^Wellcomm','^Wellcomm','Wellcomm',''],
 	['^Wilk','^Wilk','Wilk',''],
 	['^(Wortmann(\sAG)?|Terra\s?US)','^Wortmann(\sAG)?','Wortmann AG',''],
 	['^Xintor','^Xintor','Xintor',''],
 	['^XPG','^XPG','XPG',''],
 	['^XrayDisk','^XrayDisk','XrayDisk',''],
+	['^Xstar','^Xstar','Xstar',''],
 	['^(XUM|HX[0-9])','^XUM','XUM',''],
 	['^XUNZHE','^XUNZHE','XUNZHE',''],
 	['^(Yeyian|valk)','^Yeyian','Yeyian',''],
@@ -10727,7 +11782,7 @@ sub device_vendor {
 	return if !$model;
 	set_vendors() if !@vendors;
 	# 0 - match pattern; 1 - replace pattern; 2 - vendor print; 3 - serial pattern
-	# Data URLs: inxi-resources.txt Section: DiskData device_vendor()
+	# Data URLs: inxi-resources.txt Section: DriveItem device_vendor()
 	# $model = 'H10 HBRPEKNX0202A NVMe INTEL 512GB';
 	# $model = 'Patriot Memory';
 	foreach my $row (@vendors){
@@ -10759,24 +11814,24 @@ sub hdd_temp {
 	my ($device) = @_;
 	my ($path) = ('');
 	my (@data,$hdd_temp);
-	$hdd_temp = hdd_temp_sys($device) if !$b_hddtemp_force && -e "/sys/block/$device";
+	$hdd_temp = hdd_temp_sys($device) if !$force{'hddtemp'} && -e "/sys/block/$device";
 	if (!$hdd_temp){
 		$device = "/dev/$device";
 		if ($device =~ /nvme/i){
 			if (!$b_nvme){
 				$b_nvme = 1;
-				if ($path = main::check_program('nvme')) {
+				if ($path = main::check_program('nvme')){
 					$nvme = $path;
 				}
 			}
 			if ($nvme){
 				$device =~ s/n[0-9]//;
-				@data = main::grabber("$sudo$nvme smart-log $device 2>/dev/null");
+				@data = main::grabber("$sudoas$nvme smart-log $device 2>/dev/null");
 				foreach (@data){
 					my @row = split(/\s*:\s*/, $_);
 					next if !$row[0];
 					# other rows may have: Temperature sensor 1 :
-					if ( $row[0] eq 'temperature') {
+					if ($row[0] eq 'temperature'){
 						$row[1] =~ s/\s*C//;
 						$hdd_temp = $row[1];
 						last;
@@ -10787,12 +11842,12 @@ sub hdd_temp {
 		else {
 			if (!$b_hddtemp){
 				$b_hddtemp = 1;
-				if ($path = main::check_program('hddtemp')) {
+				if ($path = main::check_program('hddtemp')){
 					$hddtemp = $path;
 				}
 			}
 			if ($hddtemp){
-				$hdd_temp = (main::grabber("$sudo$hddtemp -nq -u C $device 2>/dev/null"))[0];
+				$hdd_temp = (main::grabber("$sudoas$hddtemp -nq -u C $device 2>/dev/null"))[0];
 			}
 		}
 		$hdd_temp =~ s/\s?(Celsius|C)$// if $hdd_temp;
@@ -10803,18 +11858,38 @@ sub hdd_temp {
 sub hdd_temp_sys {
 	eval $start if $b_log;
 	my ($device) = @_;
-	my ($hdd_temp,$hdd_temp_alt,%sensors,@working);
+	my ($hdd_temp,$hdd_temp_alt,%sensors,@data,@working);
 	my ($holder,$index) = ('','');
-	my $path = Cwd::abs_path("/sys/block/$device");
-	return if !$path;
-	# slice out the part of path that gives us hwmon
-	$path =~ s%/(block|nvme)/.*$%%;
-	return if ! -e "$path/hwmon/";
-	my @data = main::globber("$path/hwmon/hwmon*/temp*");
-	#print "device: $device\n";
+	my $path = "/sys/block/$device/device";
+	my $path_trimmed = Cwd::abs_path("/sys/block/$device");
+	# slice out the part of path that gives us hwmon in earlier kernel drivetemp
+	$path_trimmed =~ s%/(block|nvme)/.*$%% if $path_trimmed;
+	print "device: $device path: $path\n path_trimmed: $path_trimmed\n" if $dbg[21];
+	return if ! -e $path && (!$path_trimmed || ! -e "$path_trimmed/hwmon");
+	# first type, trimmed block,nvme (ata and nvme), 5.9 kernel:
+	# /sys/devices/pci0000:10/0000:10:08.1/0000:16:00.2/ata8/host7/target7:0:0/7:0:0:0/hwmon/hwmon5/
+	# /sys/devices/pci0000:10/0000:10:01.2/0000:13:00.0/hwmon/hwmon0/ < nvme
+	# /sys/devices/pci0000:00/0000:00:01.3/0000:01:00.1/ata2/host1/target1:0:0/1:0:0:0/hwmon/hwmon3/
+	# second type, 5.10+ kernel:
+	# /sys/devices/pci0000:20/0000:20:03.1/0000:21:00.0/nvme/nvme0/nvme0n1/device/hwmon1
+	# /sys/devices/pci0000:00/0000:00:08.1/0000:0b:00.2/ata12/host11/target11:0:0/11:0:0:0/block/sdd/device/hwmon/hwmon1
+	# we don't want these items: crit|max|min|lowest|highest
+	# original kernel 5.8/9 match for nvme and sd, 5.10+ match for sd
+	if (-e "$path_trimmed/hwmon/"){
+		@data = main::globber("$path_trimmed/hwmon/hwmon*/temp*_{input,label}");
+	}
+	# this case only happens if path_trimmed case isn't there, but leave in case
+	elsif (-e "$path/hwmon/"){
+		@data = main::globber("$path/hwmon/hwmon*/temp*_{input,label}");
+	}
+	# current match for nvme, but fails for 5.8/9 kernel nvme
+	else {
+		@data = main::globber("$path/hwmon*/temp*_{input,label}");
+	}
+	# seeing long lag to read temp input files for some reason
 	foreach (sort @data){
-		#print "file: $_\n";
-		#print(main::reader($_,'',0),"\n");
+		# print "file: $_\n";
+		# print(main::reader($_,'',0),"\n");
 		$path = $_;
 		# cleanup everything in front of temp, the path
 		$path =~ s/^.*\///;
@@ -10847,7 +11922,7 @@ sub hdd_temp_sys {
 	$hdd_temp = sprintf("%.1f", $hdd_temp/1000) if $hdd_temp;
 	main::log_data('data',"device: $device temp: $hdd_temp") if $b_log;
 	main::log_data('dump','%sensors',\%sensors) if $b_log;
-	print Data::Dumper::Dumper \%sensors if $test[21];
+	print Data::Dumper::Dumper \%sensors if $dbg[21];
 	eval $end if $b_log;
 	return $hdd_temp;
 }
@@ -10858,11 +11933,11 @@ sub block_data {
 	# 0: logical block size 1: disk physical block size/partition block size;
 	my @blocks = (0,0); 
 	my ($block_log,$block_size) = (0,0);
-	#my $path_size = "/sys/block/$id/size";
+	# my $path_size = "/sys/block/$id/size";
 	my $path_log_block = "/sys/block/$id/queue/logical_block_size";
 	my $path_phy_block = "/sys/block/$id/queue/physical_block_size";
 	# legacy system path
-	if (! -e $path_phy_block && -e "/sys/block/$id/queue/hw_sector_size" ){
+	if (! -e $path_phy_block && -e "/sys/block/$id/queue/hw_sector_size"){
 		$path_phy_block = "/sys/block/$id/queue/hw_sector_size";
 	}
 	$block_log = main::reader($path_log_block,'',0) if  -r $path_log_block;
@@ -10878,7 +11953,7 @@ sub device_speed {
 	my ($device) = @_;
 	my ($b_nvme,$lanes,$speed,@data);
 	my $working = Cwd::abs_path("/sys/class/block/$device");
-	#print "$working\n";
+	# print "$working\n";
 	if ($working){
 		my ($id);
 		# slice out the ata id:
@@ -10910,7 +11985,7 @@ sub device_speed {
 					# pcie1: 2.5 GT/s; pcie2: 5.0 GT/s; pci3: 8 GT/s
 					# NOTE: PCIe 3 stopped using the 8b/10b encoding but a sample pcie3 nvme has 
 					# rated speed of GT/s * .8 anyway. GT/s * (128b/130b)
-					$speed = ($speed <= 5 ) ? $speed * .8 : $speed * 128/130; 
+					$speed = ($speed <= 5) ? $speed * .8 : $speed * 128/130; 
 					$speed = sprintf("%.1f",$speed) if $speed;
 					$working = "/sys/class/nvme/$id/device/max_link_width";
 					$lanes = main::reader($working,'',0) if -r $working;
@@ -10932,54 +12007,22 @@ sub device_speed {
 		}
 	}
 	@data = ($speed,$lanes);
-	#print "$working $speed\n";
+	# print "$working $speed\n";
 	eval $end if $b_log;
 	return @data;
 }
-# gptid/c5e940f1-5ce2-11e6-9eeb-d05099ac4dc2     N/A  ada0p1
-sub match_glabel {
-	eval $start if $b_log;
-	my ($gptid) = @_;
-	return if !@glabel || ! $gptid;
-	#$gptid =~ s/s[0-9]+$//;
-	my ($dev_id) = ('');
-	foreach (@glabel){
-		my @temp = split(/\s+/, $_);
-		my $gptid_trimmed = $gptid;
-		# slice off s[0-9] from end in case they use slice syntax
-		$gptid_trimmed =~ s/s[0-9]+$//;
-		if (defined $temp[0] && ($temp[0] eq $gptid || $temp[0] eq $gptid_trimmed ) ){
-			$dev_id = $temp[2];
-			last;
-		}
-	}
-	$dev_id ||= $gptid; # no match? return full string
-	eval $end if $b_log;
-	return $dev_id;
-}
-sub set_glabel {
-	eval $start if $b_log;
-	$b_glabel = 1;
-	if (my $path = main::check_program('glabel')){
-		@glabel = main::grabber("$path status 2>/dev/null");
-	}
-	main::log_data('dump','@glabel:with Headers',\@glabel) if $b_log;
-	# get rid of first header line
-	shift @glabel;
-	eval $end if $b_log;
-}
 }
 
-## GraphicData 
+## GraphicItem 
 {
-package GraphicData;
+package GraphicItem;
 my $driver = ''; # we need this as a fallback in case no xorg log found
 my %graphics;
 sub get {
 	eval $start if $b_log;
 	my (@rows);
 	my $num = 0;
-	if (($b_arm || $b_mips) && !$b_soc_gfx && !$b_pci_tool){
+	if (($b_arm || $b_mips) && !$use{'soc-gfx'} && !$use{'pci-tool'}){
 		my $type = ($b_arm) ? 'arm' : 'mips';
 		my $key = 'Message';
 		push(@rows, {
@@ -11009,31 +12052,32 @@ sub get {
 
 sub device_output {
 	eval $start if $b_log;
+	return if !$devices{'graphics'};
 	my (@rows);
 	my ($j,$num) = (0,1);
-	foreach my $row (@devices_graphics){
+	foreach my $row (@{$devices{'graphics'}}){
 		$num = 1;
-		#print "$row->[0] $row->[3]\n";
+		# print "$row->[0] $row->[3]\n";
 		# not using 3D controller yet, needs research: |3D controller |display controller
 		# note: this is strange, but all of these can be either a separate or the same
 		# card. However, by comparing bus id, say: 00:02.0 we can determine that the
 		# cards are  either the same or different. We want only the .0 version as a valid
 		# card. .1 would be for example: Display Adapter with bus id x:xx.1, not the right one
 		next if $row->[3] != 0;
-		#print "$row->[0] $row->[3]\n";
+		# print "$row->[0] $row->[3]\n";
 		$j = scalar @rows;
 		$driver = $row->[9];
 		$driver ||= 'N/A';
-		my $card = main::trimmer($row->[4]);
-		$card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
+		my $device = main::trimmer($row->[4]);
+		$device = ($device) ? main::pci_cleaner($device,'output') : 'N/A';
 		# have seen absurdly verbose card descriptions, with non related data etc
-		if (length($card) > 85 || $size{'max'} < 110){
-			$card = main::pci_long_filter($card);
+		if (length($device) > 85 || $size{'max'} < 110){
+			$device = main::pci_long_filter($device);
 		}
 		push(@rows, {
-		main::key($num++,1,1,'Device') => $card,
+		main::key($num++,1,1,'Device') => $device,
 		},);
-		if ($extra > 0 && $b_pci_tool && $row->[12]){
+		if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
 			my $item = main::get_pci_vendor($row->[4],$row->[12]);
 			$rows[$j]->{main::key($num++,0,2,'vendor')} = $item if $item;
 		}
@@ -11048,15 +12092,15 @@ sub device_output {
 			$rows[$j]->{main::key($num++,0,3,'alternate')} = $row->[10] if $row->[10];
 		}
 		if ($extra > 0){
-			$rows[$j]->{main::key($num++,0,2,'bus ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = (!$row->[2] && !$row->[3]) ? 'N/A' : "$row->[2].$row->[3]";
 		}
 		if ($extra > 1){
-			$rows[$j]->{main::key($num++,0,2,'chip ID')} = ($row->[5]) ? "$row->[5]:$row->[6]" : $row->[6];
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = ($row->[5]) ? "$row->[5]:$row->[6]" : $row->[6];
 		}
 		if ($extra > 2 && $row->[1]){
-			$rows[$j]->{main::key($num++,0,2,'class ID')} = $row->[1];
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = $row->[1];
 		}
-		#print "$row->[0]\n";
+		# print "$row->[0]\n";
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -11065,46 +12109,44 @@ sub usb_output {
 	eval $start if $b_log;
 	my (@rows,@ids,$driver,$path_id,$product,@temp2);
 	my ($j,$num) = (0,1);
-	return if !@usb;
-	foreach my $row (@usb){
+	return if !$usb{'graphics'};
+	foreach my $row (@{$usb{'graphics'}}){
 		# these tests only work for /sys based usb data for now
-		if ($row->[14] && ($row->[14] eq 'Audio-Video' || $row->[14] eq 'Video' ) ){
-			$num = 1;
-			$j = scalar @rows;
-			# makre sure to reset, or second device trips last flag
-			($driver,$path_id,$product) = ('','','');
-			$product = main::cleaner($row->[13]) if $row->[13];
-			$driver = $row->[15] if $row->[15];
-			$path_id = $row->[2] if $row->[2];
-			$product ||= 'N/A';
-			# note: for real usb video out, no generic drivers? webcams may have one though
-			if (!$driver){
-				if ($row->[14] eq 'Audio-Video'){
-					$driver = 'N/A';
-				}
-				else {
-					$driver = 'N/A';
-				}
-			}
-			push(@rows, {
-			main::key($num++,1,1,'Device') => $product,
-			main::key($num++,0,2,'type') => 'USB',
-			main::key($num++,0,2,'driver') => $driver,
-			},);
-			if ($extra > 0){
-				$rows[$j]->{main::key($num++,0,2,'bus ID')} = "$path_id:$row->[1]";
-			}
-			if ($extra > 1){
-				$row->[7] ||= 'N/A';
-				$rows[$j]->{main::key($num++,0,2,'chip ID')} = $row->[7];
-			}
-			if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
-				$rows[$j]->{main::key($num++,0,2,'class ID')} = "$row->[4]$row->[5]";
+		$num = 1;
+		$j = scalar @rows;
+		# make sure to reset, or second device trips last flag
+		($driver,$path_id,$product) = ('','','');
+		$product = main::cleaner($row->[13]) if $row->[13];
+		$driver = $row->[15] if $row->[15];
+		$path_id = $row->[2] if $row->[2];
+		$product ||= 'N/A';
+		# note: for real usb video out, no generic drivers? webcams may have one though
+		if (!$driver){
+			if ($row->[14] eq 'Audio-Video'){
+				$driver = 'N/A';
 			}
-			if ($extra > 2 && $row->[16]){
-				$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
+			else {
+				$driver = 'N/A';
 			}
 		}
+		push(@rows, {
+		main::key($num++,1,1,'Device') => $product,
+		main::key($num++,0,2,'type') => 'USB',
+		main::key($num++,0,2,'driver') => $driver,
+		},);
+		if ($extra > 0){
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+		}
+		if ($extra > 1){
+			$row->[7] ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $row->[7];
+		}
+		if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+		}
+		if ($extra > 2 && $row->[16]){
+			$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
+		}
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -11119,7 +12161,7 @@ sub display_output(){
 	if ($extra > 1 || $protocol eq 'wayland'){
 		set_compositor($protocol);
 	}
-	if ( $b_display){
+	if ($b_display){
 		display_data_x();
 		# currently barebones, wayland needs a lot more work
 		if ($protocol && $protocol eq 'wayland' && !$graphics{'screens'}){
@@ -11136,17 +12178,17 @@ sub display_output(){
 	$graphics{'x-version'} = $graphics{'xorg-version'} if $graphics{'xorg-version'};;
 	$graphics{'x-version'} = x_version() if !$graphics{'x-version'};
 	$graphics{'x-version'} = $graphics{'x-version-id'} if !$graphics{'x-version'};
-	#print Data::Dumper::Dumper \%graphics;
+	# print Data::Dumper::Dumper \%graphics;
 	if (%graphics){
 		my ($driver_missing,$resolution,$server_string) = ('','','');
 		# print "$graphics{'x-vendor'} $graphics{'x-version'} $graphics{'x-vendor-release'}","\n";
 		if ($graphics{'x-vendor'}){
 			my $version = ($graphics{'x-version'}) ? " $graphics{'x-version'}" : '';
-			#$version = (!$version && $graphics{'x-vendor-release'}) ? " $graphics{'x-vendor-release'}" : '';
+			# $version = (!$version && $graphics{'x-vendor-release'}) ? " $graphics{'x-vendor-release'}" : '';
 			$server_string = "$graphics{'x-vendor'}$version";
-			#print "$server_string\n";
+			# print "$server_string\n";
 		}
-		elsif ($graphics{'x-version'}) {
+		elsif ($graphics{'x-version'}){
 			if ($graphics{'x-version'} =~ /^Xvesa/){
 				$server_string = $graphics{'x-version'};
 			}
@@ -11182,8 +12224,8 @@ sub display_output(){
 				# located inside this directory, which is not readable unless you are root
 				# Normally Arch gdm log is here: ~/.local/share/xorg/Xorg.1.log
 				# $driver comes from the Device lines, and is just last fallback.
-				if ($driver){
-					if (-e '/var/lib/gdm' && !$b_root ){
+				if ($driver && $driver ne 'N/A'){
+					if (-e '/var/lib/gdm' && !$b_root){
 						$driver_missing = main::row_defaults('display-driver-na') . ' - ' . main::row_defaults('root-suggested');
 					}
 					else {
@@ -11213,9 +12255,9 @@ sub display_output(){
 				$row[0]->{main::key($num++,0,3,'alternate')} = $drivers[3];
 			}
 		}
-		if ($b_admin ){
+		if ($b_admin){
 			if (defined $graphics{'display-id'}){
-				$row[0]->{main::key($num++,0,2,'display ID')} = $graphics{'display-id'};
+				$row[0]->{main::key($num++,0,2,'display-ID')} = $graphics{'display-id'};
 			}
 			if (defined $graphics{'display-screens'}){
 				$row[0]->{main::key($num++,0,2,'screens')} = $graphics{'display-screens'};
@@ -11237,8 +12279,8 @@ sub display_output(){
 				$screen_count++;
 				($diag,$dpi,$hz,$resolution,$size) = (undef);
 				$row_key++ if !$show{'graphic-basic'};
-				if ( !$show{'graphic-basic'} || $m_count == 0 ){
-					if ( !$show{'graphic-basic'} && defined $main->{'screen'} ){
+				if (!$show{'graphic-basic'} || $m_count == 0){
+					if (!$show{'graphic-basic'} && defined $main->{'screen'}){
 						$row[$row_key]->{main::key($num++,1,2,'Screen')} = $main->{'screen'};
 					}
 					$resolution = $main->{'res-x'} . 'x' . $main->{'res-y'} if $main->{'res-x'} && $main->{'res-y'};
@@ -11247,7 +12289,7 @@ sub display_output(){
 					if ($s_count == 1 || !$show{'graphic-basic'}){
 						$row[$row_key]->{main::key($num++,0,3,'s-res')} = $resolution;
 					}
-					elsif ($show{'graphic-basic'}) {
+					elsif ($show{'graphic-basic'}){
 						$row[$row_key]->{main::key($num++,0,3,'s-res')} = '' if $screen_count == 1;
 						$row[$row_key]->{main::key($num++,0,3,$screen_count)} = $resolution;
 					}
@@ -11255,7 +12297,7 @@ sub display_output(){
 					if ($main->{'s-dpi'} && (!$show{'graphic-basic'} || $extra > 1)){
 						$row[$row_key]->{main::key($num++,0,3,'s-dpi')} = $main->{'s-dpi'};
 					}
-					if ( !$show{'graphic-basic'} ){
+					if (!$show{'graphic-basic'}){
 						if ($main->{'size-x'} && $main->{'size-y'}){
 							$size = $main->{'size-x'} . 'x' . $main->{'size-y'} . 
 							'mm ('. $main->{'size-x-i'} . 'x' . $main->{'size-y-i'} . '")';
@@ -11270,7 +12312,7 @@ sub display_output(){
 					}
 				}
 				if ($main->{'monitors'}){
-					#print $basic_count . '::' . $m_count, "\n";
+					# print $basic_count . '::' . $m_count, "\n";
 					foreach my $monitor (@{$main->{'monitors'}}){
 						($diag,$dpi,$hz,$resolution,$size) = (undef);
 						if ($show{'graphic-basic'}){
@@ -11305,7 +12347,7 @@ sub display_output(){
 						$row[$row_key]->{main::key($num++,0,4,'hz')} = $hz if $hz;
 						$dpi = ($monitor->{'dpi'}) ? $monitor->{'dpi'} : '';
 						$row[$row_key]->{main::key($num++,0,4,'dpi')} = $dpi if $dpi;
-						#print "$dpi :: $main->{'s-dpi'}\n";
+						# print "$dpi :: $main->{'s-dpi'}\n";
 						if ($monitor->{'size-x'} && $monitor->{'size-y'}){
 							$size =  $monitor->{'size-x'} . 'x' . $monitor->{'size-y'} .
 							'mm ('. $monitor->{'size-x-i'} . 'x' . $monitor->{'size-y-i'} . '")';
@@ -11342,12 +12384,12 @@ sub display_data_x {
 		my ($screen_id,$screen,@working);
 		my ($res_x,$res_x_i,$res_y,$res_y_i,$size_x,$size_x_i,$size_y,$size_y_i);
 		my @xdpyinfo = main::grabber("$program $display_opt 2>/dev/null","\n",'strip');
-		#@xdpyinfo = map {s/^\s+//;$_} @xdpyinfo if @xdpyinfo;
-		#print join("\n",@xdpyinfo), "\n";
+		# @xdpyinfo = map {s/^\s+//;$_} @xdpyinfo if @xdpyinfo;
+		# print join("\n",@xdpyinfo), "\n";
 		foreach (@xdpyinfo){
 			@working = split(/:\s+/, $_);
-			next if ( ($graphics{'screens'} && $working[0] !~ /^(dimensions$|screen\s#)/ ) || !$working[0] );
-			#print "$_\n";
+			next if (($graphics{'screens'} && $working[0] !~ /^(dimensions$|screen\s#)/) || !$working[0]);
+			# print "$_\n";
 			if ($working[0] eq 'vendor string'){
 				$working[1] =~ s/The\s|\sFoundation//g;
 				# some distros, like fedora, report themselves as the xorg vendor, 
@@ -11396,7 +12438,7 @@ sub display_data_x {
 					$size_x_i = ($3) ? sprintf("%.1f", ($3/25.4)) : 0;
 					$size_y_i = ($4) ? sprintf("%.1f", ($4/25.4)) : 0;
 					$dpi = ($res_x && $size_x) ? sprintf("%.0f", ($res_x*25.4/$size_x)) : '';
-					$diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4 )) : '';
+					$diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4)) : '';
 					$diagonal += 0 if $diagonal;# trick to get rid of decimal 0
 					$diagonal_m = ($res_x && $size_x) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
 				}
@@ -11417,14 +12459,14 @@ sub display_data_x {
 				push(@{$graphics{'screens'}}, $screen);
 			}
 		}
-		#print Data::Dumper::Dumper $graphics{'screens'};
+		# print Data::Dumper::Dumper $graphics{'screens'};
 		if (my $program = main::check_program('xrandr')){
 			($diagonal,$diagonal_m,$dpi) = (undef);
 			($screen_id,$screen,@working) = (undef);
 			($res_x,$res_x_i,$res_y,$res_y_i,$size_x,$size_x_i,$size_y,$size_y_i) = (undef);
 			my (@monitors,$monitor_id,$screen,$screen_id,@xrandr_screens);
 			my @xrandr = main::grabber("$program $display_opt 2>/dev/null",'','strip');
-			#$graphics{'dimensions'} = (\@dimensions);
+			# $graphics{'dimensions'} = (\@dimensions);
 			# we get a bit more info from xrandr than xdpyinfo, but xrandr fails to handle
 			# multiple screens from different video cards
 			foreach (@xrandr){
@@ -11444,7 +12486,7 @@ sub display_data_x {
 					$size_x_i = ($7) ? sprintf("%.1f", ($7/25.4)) : 0;
 					$size_y_i = ($8) ? sprintf("%.1f", ($8/25.4)) : 0;
 					$dpi = ($res_x && $size_x) ? sprintf("%.0f", $res_x * 25.4 / $size_x) : '';
-					$diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4 )) : '';
+					$diagonal = ($res_x && $size_x) ? sprintf("%.1f", (sqrt($size_x**2 + $size_y**2)/25.4)) : '';
 					$diagonal += 0 if $diagonal; # trick to get rid of decimal 0
 					$diagonal_m = ($res_x && $size_x) ? sprintf("%.0f", (sqrt($size_x**2 + $size_y**2))) : '';
 					push(@monitors, {
@@ -11476,11 +12518,11 @@ sub display_data_x {
 				}
 			}
 			push(@xrandr_screens, \@monitors) if @monitors;
-			#print "xrand: " . Data::Dumper::Dumper \@xrandr_screens;
+			# print "xrand: " . Data::Dumper::Dumper \@xrandr_screens;
 			my ($i) = (0);
 			foreach my $main (@{$graphics{'screens'}}){
 				# print "h: " . Data::Dumper::Dumper $main;
-				#print $main->{'screen'}, "\n";
+				# print $main->{'screen'}, "\n";
 				foreach my $screens (@xrandr_screens){
 					# print "d: " . Data::Dumper::Dumper $screens;
 					if ($screens->[0]{'screen'} eq $main->{'screen'}){
@@ -11490,7 +12532,7 @@ sub display_data_x {
 				}
 				$i++;
 			}
-			if (!$graphics{'screens'}) {
+			if (!$graphics{'screens'}){
 				$graphics{'tty'} = tty_data();
 			}
 		}
@@ -11498,7 +12540,7 @@ sub display_data_x {
 	else {
 		$graphics{'no-xdpyinfo'} = main::row_defaults('tool-missing-basic','xdpyinfo');
 	}
-	print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $test[17];
+	print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $dbg[17];
 	main::log_data('dump','$graphics{screens}',$graphics{'screens'}) if $b_log;
 	eval $end if $b_log;
 }
@@ -11509,8 +12551,8 @@ sub display_data_wayland {
 		# return as wayland-0 or 0?
 		$graphics{'display-id'} =~ s/wayland-?//i;
 	}
-	#print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $test[17];
-	#main::log_data('dump','@graphics{screens}',$graphics{'screens'}) if $b_log;
+	# print 'last: ', Data::Dumper::Dumper $graphics{'screens'} if $dbg[17];
+	# main::log_data('dump','@graphics{screens}',$graphics{'screens'}) if $b_log;
 	eval $end if $b_log;
 }
 sub set_compositor {
@@ -11521,7 +12563,7 @@ sub set_compositor {
 	$graphics{'compositor'} = display_compositor($protocol);
 	# gnome-shell is incredibly slow to return version
 	if (($extra > 2 || $protocol eq 'wayland') && $graphics{'compositor'} && 
-		( !$show{'system'} || $graphics{'compositor'} ne 'gnome-shell' ) ){
+	 (!$show{'system'} || $graphics{'compositor'} ne 'gnome-shell')){
 		$graphics{'compositor-version'} = (main::program_data($graphics{'compositor'},$graphics{'compositor'},3))[1];
 	}
 	eval $end if $b_log;
@@ -11537,7 +12579,7 @@ sub get_protocol {
 	$protocol = '' if $protocol eq 'tty';
 	# need to confirm that there's a point to this test, I believe no, fails out of x
 	# loginctl also results in the session id
-	if (!$protocol && $b_display && $b_force_display){
+	if (!$protocol && $b_display && $force{'display'}){
 		if (my $program = main::check_program('loginctl')){
 			my $id = '';
 			# $id = $ENV{'XDG_SESSION_ID'}; # returns tty session in console
@@ -11547,7 +12589,7 @@ sub get_protocol {
 				$id = (split(/\s+/, $_))[0];
 				last; # multiuser? too bad, we'll go for the first one
 			}
-			if ($id ){
+			if ($id){
 				my $temp = (main::grabber("$program show-session $id -p Type --no-pager --no-legend 2>/dev/null"))[0];
 				$temp =~ s/Type=// if $temp;
 				# ssh will not show /dev/ttyx so would have passed the first test
@@ -11562,13 +12604,13 @@ sub gl_output(){
 	eval $start if $b_log;
 	my $num = 0;
 	my (@row,$arg);
-	#print ("$b_display : $b_root\n");
-	if ( $b_display){
+	# print ("$b_display : $b_root\n");
+	if ($b_display){
 		if (my $program = main::check_program('glxinfo')){
 			# NOTE: glxinfo -B is not always available, unfortunately
 			my @glxinfo = main::grabber("$program $display_opt 2>/dev/null");
-			#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/graphics/glxinfo/glxinfo-ssh-centos.txt";
-			#my @glxinfo = main::reader($file);
+			# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/graphics/glxinfo/glxinfo-ssh-centos.txt";
+			# my @glxinfo = main::reader($file);
 			if (!@glxinfo){
 				my $type = 'display-console';
 				if ($b_root){
@@ -11582,7 +12624,7 @@ sub gl_output(){
 				});
 				return @row;
 			}
-			#print join("\n", @glxinfo),"\n";
+			# print join("\n", @glxinfo),"\n";
 			my $compat_version = '';
 			my ($b_compat,$b_nogl,@core_profile_version,@direct_render,@renderer,
 			@opengl_version,@working);
@@ -11593,9 +12635,9 @@ sub gl_output(){
 					if ($working[1]){
 						$working[1] = main::cleaner($working[1]);
 						# Allow all mesas
-						#if ($working[1] =~ /mesa/i){
+						# if ($working[1] =~ /mesa/i){
 						#	
-						#}
+						# }
 					}
 					# note: there are cases where gl drivers are missing and empty 
 					# field value occurs.
@@ -11607,7 +12649,7 @@ sub gl_output(){
 				}
 				# dropping all conditions from this test to just show full mesa information
 				# there is a user case where not f and mesa apply, atom mobo
-				# /opengl version/ && ( f || $2 !~ /mesa/ ) {
+				# /opengl version/ && ( f || $2 !~ /mesa/){
 				elsif (/^opengl version/i){
 					@working = split(/:\s*/, $_, 2);
 					if ($working[1]){
@@ -11622,7 +12664,7 @@ sub gl_output(){
 						@working = split(/\s+/, $working[1]);
 						$compat_version = $working[0];
 					}
-					elsif (!$b_nogl) {
+					elsif (!$b_nogl){
 						push(@opengl_version, main::row_defaults('gl-empty'));
 					}
 				}
@@ -11653,8 +12695,8 @@ sub gl_output(){
 			# non free drivers once filtered and cleaned show the same for core and compat
 			# but this stopped for some reason at 4.5/4.6 nvidia
 			if (@core_profile_version && @opengl_version && 
-			  join('', @core_profile_version) ne join( '', @opengl_version) &&
-			  !(grep {/nvidia/i} @opengl_version ) ){
+			  join('', @core_profile_version) ne join('', @opengl_version) &&
+			  !(grep {/nvidia/i} @opengl_version)){
 				@opengl_version = @core_profile_version;
 				$b_compat = 1;
 			}
@@ -11704,11 +12746,15 @@ sub tty_data(){
 	if ($size{'term-cols'}){
 		$tty = "$size{'term-cols'}x$size{'term-lines'}";
 	}
+	# this is broken
 	elsif ($b_irc && $client{'console-irc'}){
-		my $tty_working = main::get_tty_console_irc('tty');
-		if (my $program = main::check_program('stty')){
+		ShellData::console_irc_tty() if !$loaded{'con-irc-tty'};
+		my $tty_working = $client{'con-irc-tty'};
+		if ($tty_working ne '' && (my $program = main::check_program('stty'))){
 			my $tty_arg = ($bsd_type) ? '-f' : '-F';
-			$tty = (main::grabber("$program $tty_arg /dev/pts/$tty_working size 2>/dev/null"))[0];
+			# handle vtnr integers, and tty ID with letters etc.
+			$tty_working = "tty$tty_working" if -e "/dev/tty$tty_working";
+			$tty = (main::grabber("$program $tty_arg /dev/$tty_working size 2>/dev/null"))[0];
 			if ($tty){
 				my @temp = split(/\s+/, $tty);
 				$tty = "$temp[1]x$temp[0]";
@@ -11722,38 +12768,40 @@ sub x_drivers {
 	eval $start if $b_log;
 	my ($driver,@driver_data,,%drivers);
 	my ($alternate,$failed,$loaded,$sep,$unloaded) = ('','','','','');
-	if (my $log = main::system_files('xorg-log')){
-		# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-voyager-serena.log";
-		# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-all41-mint.txt";
-		# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-phd21-mint.txt";
-		# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-gm10.log";
-		# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/xorg-multi-driver-1.log";
+	if (my $log = $system_files{'xorg-log'}){
+		if ($fake{'xorg-log'}){
+			# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-voyager-serena.log";
+			# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-all41-mint.txt";
+			# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/loading-unload-failed-phd21-mint.txt";
+			# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/Xorg.0-gm10.log";
+			# $log = "$ENV{HOME}/bin/scripts/inxi/data/xorg-logs/xorg-multi-driver-1.log";
+		}
 		my @xorg = main::reader($log);
 		# list is from sgfxi plus non-free drivers, plus ARM drivers
 		my $list = join('|', qw(amdgpu apm ark armsoc atimisc ati 
 		chips cirrus cyrix fbdev fbturbo fglrx geode glide glint 
-		i128 i740 i810-dec100 i810e i810 i815 i830 i845 i855 i865 i915 i945 i965 
-		iftv imstt intel ivtv mach64 mesa mga modesetting 
-		neomagic newport nouveau nsc nvidia nv openchrome r128 radeonhd radeon 
+		i128 i740 i810-dec100 i810e i810 i815 i830 i845 i855 i865 i915 i945 
+		i965 iftv imstt intel ivtv mach64 mesa mga modesetting neomagic newport 
+		nouveau nsc nvidia nv openchrome r128 radeonhd radeon 
 		rendition s3virge s3 savage siliconmotion sisimedia sisusb sis 
 		sunbw2 suncg14 suncg3 suncg6 sunffb sunleo suntcx
 		tdfx tga trident tseng unichrome v4l vboxvideo vesa vga via vmware vmwgfx
 		voodoo));
 		# it's much cheaper to grab the simple pattern match then do the expensive one 
 		# in the main loop.
-		#@xorg = grep {/Failed|Unload|Loading/} @xorg;
+		# @xorg = grep {/Failed|Unload|Loading/} @xorg;
 		foreach (@xorg){
 			next if !/Failed|Unload|Loading/;
 			# print "$_\n";
 			# note that in file names, driver is always lower case
-			if (/\sLoading.*($list)_drv.so$/i ) {
+			if (/\sLoading.*($list)_drv.so$/i){
 				$driver=lc($1);
 				# we get all the actually loaded drivers first, we will use this to compare the
 				# failed/unloaded, which have not always actually been truly loaded
 				$drivers{$driver}='loaded';
 			}
 			# openbsd uses UnloadModule: 
-			elsif (/(Unloading\s|UnloadModule).*\"?($list)(_drv.so)?\"?$/i ) {
+			elsif (/(Unloading\s|UnloadModule).*\"?($list)(_drv.so)?\"?$/i){
 				$driver=lc($2);
 				# we get all the actually loaded drivers first, we will use this to compare the
 				# failed/unloaded, which have not always actually been truly loaded
@@ -11765,18 +12813,18 @@ sub x_drivers {
 			# which can occur. This is the driver that is actually driving the display.
 			# note that xorg will often load several modules, like modesetting,fbdev,nouveau
 			# NOTE:
-			#(II) UnloadModule: "nouveau"
-			#(II) Unloading nouveau
-			#(II) Failed to load module "nouveau" (already loaded, 0)
-			#(II) LoadModule: "modesetting"
-			elsif (/Failed.*($list)\"?.*$/i ) {
+			# (II) UnloadModule: "nouveau"
+			# (II) Unloading nouveau
+			# (II) Failed to load module "nouveau" (already loaded, 0)
+			# (II) LoadModule: "modesetting"
+			elsif (/Failed.*($list)\"?.*$/i){
 				# Set driver to lower case because sometimes it will show as 
 				# RADEON or NVIDIA in the actual x start
 				$driver=lc($1);
 				# we need to make sure that the driver has already been truly loaded, 
 				# not just discussed
 				if (exists $drivers{$driver} && $drivers{$driver} ne 'alternate'){
-					if ( $_ !~ /\(already loaded/){
+					if ($_ !~ /\(already loaded/){
 						$drivers{$driver}='failed';
 					}
 					# reset the previous line's 'unloaded' to 'loaded' as well
@@ -11791,19 +12839,19 @@ sub x_drivers {
 		}
 		my $sep = '';
 		foreach (sort keys %drivers){
-			if ($drivers{$_} eq 'loaded') {
+			if ($drivers{$_} eq 'loaded'){
 				$sep = ($loaded) ? ',' : '';
 				$loaded .= $sep . $_;
 			}
-			elsif ($drivers{$_} eq 'unloaded') {
+			elsif ($drivers{$_} eq 'unloaded'){
 				$sep = ($unloaded) ? ',' : '';
 				$unloaded .= $sep . $_;
 			}
-			elsif ($drivers{$_} eq 'failed') {
+			elsif ($drivers{$_} eq 'failed'){
 				$sep = ($failed) ? ',' : '';
 				$failed .= $sep . $_;
 			}
-			elsif ($drivers{$_} eq 'alternate') {
+			elsif ($drivers{$_} eq 'alternate'){
 				$sep = ($alternate) ? ',' : '';
 				$alternate .= $sep . $_;
 			}
@@ -11820,7 +12868,7 @@ sub x_version {
 	# load the extra X paths, it's important that these are first, because
 	# later Xorg versions show error if run in console or ssh if the true path 
 	# is not used.
-	@paths = ( qw(/usr/lib /usr/lib/xorg /usr/lib/xorg-server /usr/libexec /usr/X11R6/bin), @paths );
+	@paths = (qw(/usr/lib /usr/lib/xorg /usr/lib/xorg-server /usr/libexec /usr/X11R6/bin), @paths);
 	# IMPORTANT: both commands send version data to stderr!
 	if ($program = main::check_program('Xorg')){
 		@data = main::grabber("$program -version 2>&1");
@@ -11831,19 +12879,19 @@ sub x_version {
 	elsif ($program = main::check_program('Xvesa')){
 		@data = main::grabber("$program -version 2>&1");
 	}
-	#print join('^ ', @paths), " :: $program\n";
-	#print Data::Dumper::Dumper \@data;
+	# print join('^ ', @paths), " :: $program\n";
+	# print Data::Dumper::Dumper \@data;
 	if (@data){
 		foreach (@data){
 			if (/^X.org X server/i){
 				$version = (split(/\s+/, $_))[3];
 				last;
 			}
-			elsif (/^X Window System Version/i) {
+			elsif (/^X Window System Version/i){
 				$version = (split(/\s+/, $_))[4];
 				last;
 			}
-			elsif (/^Xvesa from/i) {
+			elsif (/^Xvesa from/i){
 				$version = (split(/\s+/, $_))[3];
 				$version = "Xvesa $version" if $version;
 				last;
@@ -11860,7 +12908,7 @@ sub display_compositor {
 	eval $start if $b_log;
 	my ($protocol) = @_; 
 	my ($compositor) = ('');
-	main::set_ps_gui() if !$b_ps_gui;
+	main::set_ps_gui() if !$loaded{'ps-gui'};
 	if (@ps_gui){
 		# 1 check program; 2 search; 3 unused version; 4 print
 		my @compositors = (
@@ -11874,7 +12922,7 @@ sub display_compositor {
 		['gnome-shell','gnome-shell','','gnome-shell'],
 		['kwin_wayland','kwin_wayland','','kwin_wayland'],
 		['kwin_x11','kwin_x11','','kwin_x11'],
-		#['kwin','kwin','','kwin'],
+		# ['kwin','kwin','','kwin'],
 		['marco','marco','','marco'],
 		['muffin','muffin','','muffin'],
 		['mutter','mutter','','mutter'],
@@ -11891,6 +12939,7 @@ sub display_compositor {
 		['mir','mir','','mir'],
 		['moblin','moblin','','moblin'],
 		['motorcar','motorcar','','motorcar'],
+		['monsterwm','monsterwm','','monsterwm'],
 		['orbital','orbital','','orbital'],
 		['papyros','papyros','','papyros'],
 		['perceptia','perceptia','','perceptia'],
@@ -11908,10 +12957,13 @@ sub display_compositor {
 		['wayhouse','wayhouse','','wayhouse'],
 		['westford','westford','','westford'],
 		['xcompmgr','xcompmgr','','xcompmgr'],
+		['xfwm4','xfwm4','','xfwm4'],
+		['xfwm5','xfwm5','','xfwm5'],
+		['xfwm','xfwm','','xfwm'],
 		);
 		foreach my $item (@compositors){
 			# no need to use check program with short list of ps_gui
-			# if (main::check_program($item[0]) && (grep {/^$item[1]$/} @ps_gui ) ){
+			# if (main::check_program($item[0]) && (grep {/^$item[1]$/} @ps_gui)){
 			if (grep {/^$item->[1]$/} @ps_gui){
 				$compositor = $item->[3];
 				last;
@@ -11924,9 +12976,9 @@ sub display_compositor {
 }
 }
 
-## LogicalData
+## LogicalItem
 {
-package LogicalData;
+package LogicalItem;
 
 sub get {
 	eval $start if $b_log;
@@ -11934,17 +12986,17 @@ sub get {
 	my $num = 0;
 	if ($bsd_type){
 		$key1 = 'Message';
-		$val1 = main::row_defaults('lvm-data-bsd');
+		$val1 = main::row_defaults('logical-data-bsd',$uname[0]);
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
 	}
  	else {
-		main::set_lsblk() if !$b_lsblk;
-		if ($b_fake_logical || $alerts{'lvs'}->{'action'} eq 'use'){
-			lvm_data() if !$b_lvm_data;
+		LsblkData::set() if !$loaded{'lsblk'};
+		if ($fake{'logical'} || $alerts{'lvs'}->{'action'} eq 'use'){
+			lvm_data() if !$loaded{'logical-data'};
 			if (!@lvm){
 				my $key = 'Message';
 				# note: arch linux has a bug where lvs returns 0 if non root start
-				my $message = ($b_active_lvm) ? $alerts{'lvs'}->{'permissions'} : main::row_defaults('lvm-data','');
+				my $message = ($use{'logical-lvm'}) ? main::row_defaults('tool-permissions','lvs') : main::row_defaults('logical-data','');
 				push(@rows, {
 				main::key($num++,0,1,$key) => $message,
 				},);
@@ -11954,26 +13006,26 @@ sub get {
 				@rows = lvm_output(\%processed);
 			}
 		}
-		elsif ($b_active_lvm && $alerts{'lvs'}->{'action'} eq 'permissions'){
+		elsif ($use{'logical-lvm'} && $alerts{'lvs'}->{'action'} eq 'permissions'){
 			my $key = 'Message';
 			push(@rows, {
-			main::key($num++,0,1,$key) => $alerts{'lvs'}->{'permissions'},
+			main::key($num++,0,1,$key) => $alerts{'lvs'}->{'message'},
 			},);
 		}
-		elsif (@lsblk && !$b_active_lvm && ($alerts{'lvs'}->{'action'} eq 'permissions' || 
+		elsif (@lsblk && !$use{'logical-lvm'} && ($alerts{'lvs'}->{'action'} eq 'permissions' || 
 		       $alerts{'lvs'}->{'action'} eq 'missing')){
 			my $key = 'Message';
 			push(@rows, {
-			main::key($num++,0,1,$key) => main::row_defaults('lvm-data',''),
+			main::key($num++,0,1,$key) => main::row_defaults('logical-data',''),
 			},);
 		}
 		elsif ($alerts{'lvs'}->{'action'} ne 'use'){
 			$key1 = $alerts{'lvs'}->{'action'};
-			$val1 = $alerts{'lvs'}->{$key1};
+			$val1 = $alerts{'lvs'}->{'message'};
 			$key1 = ucfirst($key1);
 			@rows = ({main::key($num++,0,1,$key1) => $val1,});
 		}
-		if ($b_active_general){
+		if ($use{'logical-general'}){
 			my @general_data = general_data();
 			push(@rows,general_output(\@general_data)) if @general_data;
 		}
@@ -12083,9 +13135,9 @@ sub components_recursive_output {
 	elsif ($type eq 'lvm'){
 		($l2,$l3) = (4+$indent,5+$indent);
 	}
-	#print 'outside: ', scalar @$component, "\n", Data::Dumper::Dumper $component;
+	# print 'outside: ', scalar @$component, "\n", Data::Dumper::Dumper $component;
 	foreach my $component (@$components){
-		#print "inside: -n", Data::Dumper::Dumper $component->[$i];
+		# print "inside: -n", Data::Dumper::Dumper $component->[$i];
 		$$j = scalar @$rows if $b_admin;
 		my $id;
 		if ($component->[0] =~ /^(bcache|dm-|md)[0-9]/){
@@ -12099,6 +13151,7 @@ sub components_recursive_output {
 		$$rows[$$j]->{main::key($$num++,1,$l2,$id)} = $component->[0];
 		if ($extra > 1){
 			if ($b_admin){
+				$component->[1] ||= 'N/A';
 				$$rows[$$j]->{main::key($$num++,0,$l3,'maj-min')} = $component->[1];
 				$$rows[$$j]->{main::key($$num++,0,$l3,'mapped')} = $component->[3] if $component->[3];
 				$size = main::get_size($component->[2],'string','N/A');
@@ -12116,16 +13169,17 @@ sub components_recursive_output {
 sub general_data {
 	eval $start if $b_log;
 	my (@found,@general_data,%parent,$parent_fs);
-	main::set_mapper() if !$b_mapper;
+	PartitionData::set('proc') if !$loaded{'partition-data'};
+	main::set_mapper() if !$loaded{'mapper'};
 	foreach my $row (@lsblk){
 		# bcache doesn't have mapped name: !$mapper{$row->{'name'}} || 
 		next if !$row->{'parent'};
-		%parent = main::get_lsblk($row->{'parent'});
+		%parent = LsblkData::get($row->{'parent'});
 		next if !$parent{'fs'};
 		if ($row->{'type'} && (($row->{'type'} eq 'crypt' || 
 		    $row->{'type'} eq 'mpath' || $row->{'type'} eq 'multipath')  ||
 		    ($row->{'type'} eq 'dm' && $row->{'name'} =~ /veracrypt/i) ||
-		    ($parent{'fs'} eq 'bcache') ) ){
+		    ($parent{'fs'} eq 'bcache'))){
 			my (@full_components,$mapped,$type);
 			$mapped = $mapper{$row->{'name'}} if %mapper;
 			next if grep(/^$row->{'name'}$/, @found);
@@ -12151,7 +13205,7 @@ sub general_data {
 			elsif ($row->{'type'} eq 'crypt'){
 				$type = 'Crypt';
 			}
-			#my $name = ($use{'filter-uuid'}) ? "luks-$filter_string" : $row->{'name'};
+			# my $name = ($use{'filter-uuid'}) ? "luks-$filter_string" : $row->{'name'};
 			component_data($row->{'maj-min'},\@full_components);
 			# print "$row->{'name'}\n", Data::Dumper::Dumper \@full_components;
 			push(@general_data, {
@@ -12165,7 +13219,7 @@ sub general_data {
 		}
 	}
 	main::log_data('dump','luks @general_data', \@general_data);
-	print Data::Dumper::Dumper \@general_data if $test[23];
+	print Data::Dumper::Dumper \@general_data if $dbg[23];
 	eval $end if $b_log;
 	return @general_data;
 }
@@ -12173,18 +13227,18 @@ sub general_data {
 # note: called for disk totals, raid, and logical
 sub lvm_data {
 	eval $start if $b_log;
-	$b_lvm_data = 1;
-	main::set_proc_partitions() if !$b_proc_partitions;
-	main::set_mapper() if !$b_mapper;
+	$loaded{'logical-data'} = 1;
 	my (@args,@data,%totals);
 	@args = qw(vg_name vg_fmt vg_size vg_free lv_name lv_layout lv_size 
 	lv_kernel_major lv_kernel_minor segtype seg_count seg_start_pe seg_size_pe 
 	stripes devices raid_mismatch_count raid_sync_action raid_write_behind
 	copy_percent);
 	my $num = 0;
-	if ($b_fake_logical){
-		my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lvm/lvs-test-1.txt";
-		@data = main::reader($file,'strip');
+	PartitionData::set() if !$loaded{'partition-data'};
+	main::set_mapper() if !$loaded{'mapper'};
+	if ($fake{'logical'}){
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lvm/lvs-test-1.txt";
+		# @data = main::reader($file,'strip');
 	}
 	else {
 		# lv_full_name: ar0-home; lv_dm_path: /dev/mapper/ar0-home
@@ -12197,11 +13251,12 @@ sub lvm_data {
 		$cmd .= ' 2>/dev/null';
 		@data = main::grabber("$cmd",'','strip');
 		main::log_data('dump','lvm @data', \@data) if $b_log;
-		print "command: $cmd\n" if $test[22];
+		print "command: $cmd\n" if $dbg[22];
 	}
 	my $j = 0;
 	foreach (@data){
 		my @line = split(/\^:/, $_);
+		next if $_ =~ /^Partial mode/i; # sometimes 2>/dev/null doesn't catch this
 		for (my $i = 0; $i < scalar @args; $i++){
 			$line[$i] =~ s/k$// if $args[$i] =~ /_(free|size|used)$/;
 			$lvm[$j]->{$args[$i]} = $line[$i];
@@ -12214,7 +13269,7 @@ sub lvm_data {
 	}
 	# print Data::Dumper::Dumper \%totals, \@raw_logical;
 	main::log_data('dump','lvm @lvm', \@lvm) if $b_log;
-	print Data::Dumper::Dumper \@lvm if $test[22];
+	print Data::Dumper::Dumper \@lvm if $dbg[22];
 	eval $end if $b_log;
 }
 sub process_lvm_data {
@@ -12250,7 +13305,7 @@ sub process_lvm_data {
 		}
 	}
 	main::log_data('dump','lvm %processed', \%processed) if $b_log;
-	print Data::Dumper::Dumper \%processed if $test[23];
+	print Data::Dumper::Dumper \%processed if $dbg[23];
 	eval $end if $b_log;
 	return %processed;
 }
@@ -12258,7 +13313,6 @@ sub component_data {
 	my ($maj_min,$full_components) = @_;
 	push(@$full_components, component_recursive_data($maj_min));
 }
-
 sub component_recursive_data {
 	eval $start if $b_log;
 	my ($maj_min) = @_;
@@ -12268,7 +13322,7 @@ sub component_recursive_data {
 	# return @devices if !$b_admin;
 	foreach my $device (@devices){
 		my ($mapped,$mm2,@part);
-		@part = main::get_proc_partition($device) if @proc_partitions; 
+		@part = PartitionData::get($device) if @proc_partitions; 
 		$mm2 = $part[0] . ':' . $part[1] if @part;
 		if ($device =~ /^(bcache|dm-|md)[0-9]+$/){
 			$mapped = $dmmapper{$device};
@@ -12284,15 +13338,15 @@ sub component_recursive_data {
 }
 }
 
-## MachineData
+## MachineItem
 {
-package MachineData;
+package MachineItem;
 
 sub get {
 	eval $start if $b_log;
 	my (%soc_machine,%data,@rows,$key1,$val1,$which);
 	my $num = 0;
-	if ($bsd_type && @sysctl_machine && !$b_dmidecode_force ){
+	if ($bsd_type && $sysctl{'machine'} && !$force{'dmidecode'}){
 		%data = machine_data_sysctl();
 		if (%data){
 			@rows = machine_output(\%data);
@@ -12302,10 +13356,10 @@ sub get {
 			$val1 = main::row_defaults('machine-data-force-dmidecode','');
 		}
 	}
-	elsif ($bsd_type || $b_dmidecode_force){
-		if ( !$b_fake_dmidecode && $alerts{'dmidecode'}->{'action'} ne 'use'){
+	elsif ($bsd_type || $force{'dmidecode'}){
+		if (!$fake{'dmidecode'} && $alerts{'dmidecode'}->{'action'} ne 'use'){
 			$key1 = $alerts{'dmidecode'}->{'action'};
-			$val1 = $alerts{'dmidecode'}->{$key1};
+			$val1 = $alerts{'dmidecode'}->{'message'};
 			$key1 = ucfirst($key1);
 		}
 		else {
@@ -12315,21 +13369,26 @@ sub get {
 			}
 			elsif (!$key1){
 				$key1 = 'Message';
-				$val1 = main::row_defaults('machine-data','');
+				$val1 = main::row_defaults('machine-data');
 			}
 		}
 	}
-	elsif (-d '/sys/class/dmi/id/') {
+	elsif (-d '/sys/class/dmi/id/'){
 		%data = machine_data_sys();
 		if (%data){
 			@rows = machine_output(\%data);
 		}
 		else {
 			$key1 = 'Message';
-			$val1 = main::row_defaults('machine-data-dmidecode','');
+			if ($alerts{'dmidecode'}->{'action'} eq 'missing'){
+				$val1 = main::row_defaults('machine-data-dmidecode');
+			}
+			else {
+				$val1 = main::row_defaults('machine-data');
+			}
 		}
 	}
-	elsif (!$bsd_type) {
+	elsif (!$bsd_type){
 		# this uses /proc/cpuinfo so only GNU/Linux
 		if ($b_arm || $b_mips || $b_ppc){
 			%data = machine_data_soc();
@@ -12341,7 +13400,7 @@ sub get {
 		}
 	}
 	# if error case, null data, whatever
-	if ($key1) {
+	if ($key1){
 		push(@rows,{main::key($num++,0,1,$key1) => $val1,});
 	}
 	eval $end if $b_log;
@@ -12376,16 +13435,16 @@ sub machine_output {
 	# The goal here is to not show laptop/mobile devices
 	# found a case of battery existing but having nothing in it on desktop mobo
 	# not all laptops show the first. /proc/acpi/battery is deprecated.
-	elsif ( !glob('/proc/acpi/battery/*') && !glob('/sys/class/power_supply/*') ){
+	elsif (!glob('/proc/acpi/battery/*') && !glob('/sys/class/power_supply/*')){
 		# ibm / ibm can be true; dell / quantum is false, so in other words, only do this
 		# in case where the vendor is the same and the version is the same and not null, 
 		# otherwise the version information is going to be different in all cases I think
-		if ( ($data->{'sys_vendor'} && $data->{'board_vendor'} && 
+		if (($data->{'sys_vendor'} && $data->{'board_vendor'} && 
 		      $data->{'sys_vendor'} eq $data->{'board_vendor'}) &&
 			 (($data->{'product_version'} && $data->{'board_version'} && 
 			   $data->{'product_version'} eq $data->{'board_version'}) ||
 			   (!$data->{'product_version'} && $data->{'product_name'} && $data->{'board_name'} && 
-			     $data->{'product_name'} eq $data->{'board_name'})) ){
+			     $data->{'product_name'} eq $data->{'board_name'}))){
 			$b_skip_system = 1;
 		}
 	}
@@ -12407,15 +13466,16 @@ sub machine_output {
 		# no point in showing chassis if system isn't there, it's very unlikely that 
 		# would be correct
 		if ($extra > 1){
-			if ($data->{'board_version'} && $data->{'chassis_version'} eq $data->{'board_version'}){
+			if ($data->{'board_version'} && $data->{'chassis_version'} &&
+			 $data->{'chassis_version'} eq $data->{'board_version'}){
 				$b_skip_chassis = 1;
 			}
-			if (!$b_skip_chassis && $data->{'chassis_vendor'} ){
-				if ($data->{'chassis_vendor'} ne $data->{'sys_vendor'} ){
+			if (!$b_skip_chassis && $data->{'chassis_vendor'}){
+				if ($data->{'chassis_vendor'} ne $data->{'sys_vendor'}){
 					$chassis_vendor = $data->{'chassis_vendor'};
 				}
 				# dmidecode can have these be the same
-				if ($data->{'chassis_type'} && $data->{'device'} ne $data->{'chassis_type'} ){
+				if ($data->{'chassis_type'} && $data->{'device'} ne $data->{'chassis_type'}){
 					$chassis_type = $data->{'chassis_type'};
 				}
 				if ($data->{'chassis_version'}){
@@ -12485,7 +13545,7 @@ sub machine_soc_output {
 	my ($soc_machine) = @_;
 	my ($key,@rows);
 	my ($cont_sys,$ind_sys,$j,$num) = (1,1,0,0);
-	#print Data::Dumper::Dumper \%soc_machine;
+	# print Data::Dumper::Dumper \%soc_machine;
 	# this is sketchy, /proc/device-tree/model may be similar to Hardware value from /proc/cpuinfo
 	# raspi: Hardware	: BCM2835 model: Raspberry Pi Model B Rev 2
 	if ($soc_machine->{'device'} || $soc_machine->{'model'}){
@@ -12533,19 +13593,19 @@ sub machine_data_sys {
 	}
 	$data{'firmware'} = 'BIOS';
 	# print Data::Dumper::Dumper \@sys_files;
-	if (!-d $sys_dir ){
-		if ( -d $sys_dir_alt){
+	if (!-d $sys_dir){
+		if (-d $sys_dir_alt){
 			$sys_dir = $sys_dir_alt;
 		}
 		else {
 			return 0;
 		}
 	}
-	if ( -d '/sys/firmware/efi'){
+	if (-d '/sys/firmware/efi'){
 		$data{'firmware'} = 'UEFI';
 	}
-	elsif ( glob('/sys/firmware/acpi/tables/UEFI*') ){
-		$data{'firmware'} = 'UEFI [Legacy]';
+	elsif (glob('/sys/firmware/acpi/tables/UEFI*')){
+		$data{'firmware'} = 'UEFI-[Legacy]';
 	}
 	foreach (@sys_files){
 		$path = "$sys_dir$_";
@@ -12553,7 +13613,7 @@ sub machine_data_sys {
 			$data{$_} = main::reader($path,'',0);
 			$data{$_} = ($data{$_}) ? main::dmi_cleaner($data{$_}) : '';
 		}
-		elsif (!$b_root && -e $path && !-r $path ){
+		elsif (!$b_root && -e $path && !-r $path){
 			$data{$_} = main::row_defaults('root-required');
 		}
 		else {
@@ -12561,7 +13621,7 @@ sub machine_data_sys {
 		}
 	}
 	if ($data{'chassis_type'}){
-		if ( $data{'chassis_type'} == 1){
+		if ($data{'chassis_type'} == 1){
 			$data{'device'} = get_device_vm($data{'sys_vendor'},$data{'product_name'});
 			$data{'device'} ||= 'other-vm?';
 		}
@@ -12573,6 +13633,7 @@ sub machine_data_sys {
 # 	foreach (keys %data){
 # 		print "$_: $data{$_}\n";
 # 	}
+	print Data::Dumper::Dumper \%data if $dbg[28];
 	main::log_data('dump','%data',\%data) if $b_log;
 	eval $end if $b_log;
 	return %data;
@@ -12584,8 +13645,8 @@ sub machine_data_sys {
 sub machine_data_soc {
 	eval $end if $b_log;
 	my (%data,@temp);
-	if (my $file = main::system_files('cpuinfo')){
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-shevaplug-1.2ghz.txt";
+	if (my $file = $system_files{'proc-cpuinfo'}){
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/cpu/arm/arm-shevaplug-1.2ghz.txt";
 		my @data = main::reader($file);
 		foreach (@data){
 			if (/^(Hardware|machine)\s*:/i){
@@ -12610,19 +13671,19 @@ sub machine_data_soc {
 		}
 	}
 	if (!$data{'model'} && $b_android){
-		main::set_build_prop() if !$b_build_prop;
+		main::set_build_prop() if !$loaded{'build-prop'};
 		if ($build_prop{'product-manufacturer'} && $build_prop{'product-model'}){
 			my $brand = '';
 			if ($build_prop{'product-brand'} && 
-			 $build_prop{'product-brand'} ne $build_prop{'product-manufacturer'}) { 
+			 $build_prop{'product-brand'} ne $build_prop{'product-manufacturer'}){ 
 				$brand = $build_prop{'product-brand'} . ' ';
 			}
 			$data{'model'} = $brand . $build_prop{'product-manufacturer'} . ' ' . $build_prop{'product-model'};
 		}
-		elsif ($build_prop{'product-device'} ){
+		elsif ($build_prop{'product-device'}){
 			$data{'model'} = $build_prop{'product-device'};
 		}
-		elsif ($build_prop{'product-name'} ){
+		elsif ($build_prop{'product-name'}){
 			$data{'model'} = $build_prop{'product-name'};
 		}
 	}
@@ -12633,7 +13694,7 @@ sub machine_data_soc {
 			$model = main::dmi_cleaner($model);
 			$model = (split(/\x01|\x02|\x03|\x00/, $model))[0] if $model;
 			my $device_temp = main::regex_cleaner($data{'device'});
-			if ( !$data{'device'} || ($model && $model !~ /\Q$device_temp\E/i) ){
+			if (!$data{'device'} || ($model && $model !~ /\Q$device_temp\E/i)){
 				$model = main::arm_cleaner($model);
 				$data{'model'} = $model;
 			}
@@ -12645,8 +13706,8 @@ sub machine_data_soc {
 		main::log_data('data',"device-tree-serial: $serial") if $b_log;
 		$data{'serial'} = $serial if $serial;
 	}
-	
-	#print Data::Dumper::Dumper \%data;
+	print Data::Dumper::Dumper \%data if $dbg[28];
+	main::log_data('dump','%data',\%data) if $b_log;
 	eval $end if $b_log;
 	return %data;
 }
@@ -12686,19 +13747,19 @@ sub machine_data_dmi {
 			foreach my $item (@$row[3 .. $#$row]){
 				if ($item !~ /^~/){ # skip the indented rows
 					my @value = split(/:\s+/, $item);
-					if ($value[0] eq 'Release Date') {
+					if ($value[0] eq 'Release Date'){
 						$data{'bios_date'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Vendor') {
+					elsif ($value[0] eq 'Vendor'){
 						$data{'bios_vendor'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Version') {
+					elsif ($value[0] eq 'Version'){
 						$data{'bios_version'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'ROM Size') {
+					elsif ($value[0] eq 'ROM Size'){
 						$data{'bios_romsize'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'BIOS Revision') {
+					elsif ($value[0] eq 'BIOS Revision'){
 						$data{'bios_rev'} = main::dmi_cleaner($value[1]) }
 				}
 				else {
-					if ($item eq '~UEFI is supported') {
+					if ($item eq '~UEFI is supported'){
 						$data{'firmware'} = 'UEFI';}
 				}
 			}
@@ -12710,15 +13771,15 @@ sub machine_data_dmi {
 			foreach my $item (@$row[3 .. $#$row]){
 				if ($item !~ /^~/){ # skip the indented rows
 					my @value = split(/:\s+/, $item);
-					if ($value[0] eq 'Product Name') {
+					if ($value[0] eq 'Product Name'){
 						$data{'product_name'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Version') {
+					elsif ($value[0] eq 'Version'){
 						$data{'product_version'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Serial Number') {
+					elsif ($value[0] eq 'Serial Number'){
 						$data{'product_serial'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Manufacturer') {
+					elsif ($value[0] eq 'Manufacturer'){
 						$data{'sys_vendor'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'UUID') {
+					elsif ($value[0] eq 'UUID'){
 						$data{'sys_uuid'} = main::dmi_cleaner($value[1]) }
 				}
 			}
@@ -12730,13 +13791,13 @@ sub machine_data_dmi {
 			foreach my $item (@$row[3 .. $#$row]){
 				if ($item !~ /^~/){ # skip the indented rows
 					my @value = split(/:\s+/, $item);
-					if ($value[0] eq 'Product Name') {
+					if ($value[0] eq 'Product Name'){
 						$data{'board_name'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Serial Number') {
+					elsif ($value[0] eq 'Serial Number'){
 						$data{'board_serial'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Manufacturer') {
+					elsif ($value[0] eq 'Manufacturer'){
 						$data{'board_vendor'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Version') {
+					elsif ($value[0] eq 'Version'){
 						$data{'board_version'} = main::dmi_cleaner($value[1]) }
 				}
 			}
@@ -12748,17 +13809,17 @@ sub machine_data_dmi {
 			foreach my $item (@$row[3 .. $#$row]){
 				if ($item !~ /^~/){ # skip the indented rows
 					my @value = split(/:\s+/, $item);
-					if ($value[0] eq 'Serial Number') {
+					if ($value[0] eq 'Serial Number'){
 						$data{'chassis_serial'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Type') {
+					elsif ($value[0] eq 'Type'){
 						$data{'chassis_type'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Manufacturer') {
+					elsif ($value[0] eq 'Manufacturer'){
 						$data{'chassis_vendor'} = main::dmi_cleaner($value[1]) }
-					elsif ($value[0] eq 'Version') {
+					elsif ($value[0] eq 'Version'){
 						$data{'chassis_version'} = main::dmi_cleaner($value[1]) }
 				}
 			}
-			if ( $data{'chassis_type'} && $data{'chassis_type'} ne 'Other' ){
+			if ($data{'chassis_type'} && $data{'chassis_type'} ne 'Other'){
 				$data{'device'} = $data{'chassis_type'};
 			}
 			next;
@@ -12786,7 +13847,7 @@ sub machine_data_dmi {
 # 	foreach (keys %data){
 # 		print "$_: $data{$_}\n";
 # 	}
-	#print Data::Dumper::Dumper \%data;
+	print Data::Dumper::Dumper \%data if $dbg[28];
 	main::log_data('dump','%data',\%data) if $b_log;
 	eval $end if $b_log;
 	return %data;
@@ -12795,45 +13856,79 @@ sub machine_data_dmi {
 # it uses hw. info from sysctl -a and bios info from dmesg.boot
 sub machine_data_sysctl {
 	eval $start if $b_log;
-	my (%data,$vm);
+	my (%data,$product,$vendor,$vm);
 	# ^hw\.(vendor|product|version|serialno|uuid)
-	foreach (@sysctl_machine){
-		next if ! $_;
+	foreach (@{$sysctl{'machine'}}){
+		next if !$_;
 		my @item = split(':', $_);
-		next if ! $item[1];
-		if ($item[0] eq 'hw.vendor'){
+		next if !$item[1];
+		if ($item[0] eq 'hw.vendor' || $item[0] eq 'machdep.dmi.board-vendor'){
 			$data{'board_vendor'} = main::dmi_cleaner($item[1]);
 		}
-		elsif ($item[0] eq 'hw.product'){
+		elsif ($item[0] eq 'hw.product' || $item[0] eq 'machdep.dmi.board-product'){
 			$data{'board_name'} = main::dmi_cleaner($item[1]);
 		}
-		elsif ($item[0] eq 'hw.version'){
-			$data{'board_version'} = $item[1];
+		elsif ($item[0] eq 'hw.version' || $item[0] eq 'machdep.dmi.board-version'){
+			$data{'board_version'} = main::dmi_cleaner($item[1]);
 		}
-		elsif ($item[0] eq 'hw.serialno'){
-			$data{'board_serial'} = $item[1];
+		elsif ($item[0] eq 'hw.serialno' || $item[0] eq 'machdep.dmi.board-serial'){
+			$data{'board_serial'} = main::dmi_cleaner($item[1]);
 		}
 		elsif ($item[0] eq 'hw.serial'){
-			$data{'board_serial'} = $item[1];
+			$data{'board_serial'} = main::dmi_cleaner($item[1]);
 		}
 		elsif ($item[0] eq 'hw.uuid'){
-			$data{'board_uuid'} = $item[1];
+			$data{'board_uuid'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.system-vendor'){
+			$data{'sys_vendor'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.system-product'){
+			$data{'product_name'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.system-version'){
+			$data{'product_version'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.system-serial'){
+			$data{'product_serial'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.system-uuid'){
+			$data{'sys_uuid'} = main::dmi_cleaner($item[1]);
 		}
 		# bios0:at mainbus0: AT/286+ BIOS, date 06/30/06, BIOS32 rev. 0 @ 0xf2030, SMBIOS rev. 2.4 @ 0xf0000 (47 entries)
 		# bios0:vendor Phoenix Technologies, LTD version "3.00" date 06/30/2006
 		elsif ($item[0] =~ /^bios[0-9]/){
-			if ($_ =~ /^^bios[0-9]:at\s.*\srev\.\s([\S]+)\s@.*/){
+			if ($_ =~ /^^bios[0-9]:at\s.*?\srev\.\s([\S]+)\s@.*/){
 				$data{'bios_rev'} = $1;
 				$data{'firmware'} = 'BIOS' if $_ =~ /BIOS/;
 			}
-			elsif ($item[1] =~ /^vendor\s(.*)\sversion\s"?([\S]+)"?\sdate\s([\S]+)/ ){
+			elsif ($item[1] =~ /^vendor\s(.*?)\sversion\s(.*?)\sdate\s([\S]+)/){
 				$data{'bios_vendor'} = $1;
 				$data{'bios_version'} = $2;
 				$data{'bios_date'} = $3;
 				$data{'bios_version'} =~ s/^v//i if $data{'bios_version'} && $data{'bios_version'} !~ /vi/i;
 			}
 		}
+		elsif ($item[0] eq 'machdep.dmi.bios-vendor'){
+			$data{'bios_vendor'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.bios-version'){
+			$data{'bios_version'} = main::dmi_cleaner($item[1]);
+		}
+		elsif ($item[0] eq 'machdep.dmi.bios-date'){
+			$data{'bios_date'} = main::dmi_cleaner($item[1]);
+		}
 	}
+	if ($data{'board_vendor'} || $data{'sys_vendor'} || $data{'board_name'} || $data{'product_name'}){
+		$vendor = $data{'sys_vendor'};
+		$vendor = $data{'board_vendor'} if !$vendor;
+		$product = $data{'product_name'};
+		$product = $data{'board_name'} if !$product;
+	}
+	# detections can be from other sources.
+	$data{'device'} = get_device_vm($vendor,$product);
+	print Data::Dumper::Dumper \%data if $dbg[28];
+	main::log_data('dump','%data',\%data) if $b_log;
 	eval $end if $b_log;
 	return %data;
 }
@@ -12890,20 +13985,22 @@ sub get_device_sys {
 sub get_device_vm {
 	eval $start if $b_log;
 	my ($manufacturer,$product_name) = @_;
+	$manufacturer ||= '';
+	$product_name ||= '';
 	my $vm;
-	if ( my $program = main::check_program('systemd-detect-virt') ){
+	if (my $program = main::check_program('systemd-detect-virt')){
 		my $vm_test = (main::grabber("$program 2>/dev/null"))[0];
 		if ($vm_test){
 			# kvm vbox reports as oracle, usually, unless they change it
 			if (lc($vm_test) eq 'oracle'){
 				$vm = 'virtualbox';
 			}
-			elsif ( $vm_test ne 'none'){
+			elsif ($vm_test ne 'none'){
 				$vm = $vm_test;
 			}
 		}
 	}
-	if (!$vm || lc($vm) eq 'bochs') {
+	if (!$vm || lc($vm) eq 'bochs'){
 		if (-e '/proc/vz'){$vm = 'openvz'}
 		elsif (-e '/proc/xen'){$vm = 'xen'}
 		elsif (-e '/dev/vzfs'){$vm = 'virtuozzo'}
@@ -12911,37 +14008,53 @@ sub get_device_vm {
 			my @vm_data = main::grabber("$program 2>/dev/null");
 			if (@vm_data){
 				if (grep {/kqemu/i} @vm_data){$vm = 'kqemu'}
-				elsif (grep {/kvm/i} @vm_data){$vm = 'kvm'}
+				elsif (grep {/kvm|qumranet/i} @vm_data){$vm = 'kvm'}
 				elsif (grep {/qemu/i} @vm_data){$vm = 'qemu'}
 			}
 		}
 	}
 	# this will catch many Linux systems and some BSDs
-	if (!$vm || lc($vm) eq 'bochs' ) {
+	if (!$vm || lc($vm) eq 'bochs'){
 		# $device_vm is '' if nothing detected
-		my @vm_data = (@sysctl,@dmesg_boot,$device_vm);
+		my @vm_data = ($device_vm);
+		push(@vm_data,@{$dboot{'machine-vm'}}) if $dboot{'machine-vm'};
 		if (-e '/dev/disk/by-id'){
 			my @dev = glob('/dev/disk/by-id/*');
 			push(@vm_data,@dev);
 		}
-		if ( grep {/innotek|vbox|virtualbox/i} @vm_data){
+		if (grep {/innotek|vbox|virtualbox/i} @vm_data){
 			$vm = 'virtualbox';
 		}
 		elsif (grep {/vmware/i} @vm_data){
 			$vm = 'vmware';
 		}
-		elsif (grep {/Virtual HD/i} @vm_data){
+		# needs to be first, because contains virtio;qumranet, grabber only gets 
+		# first instance then stops, so make sure patterns are right.
+		elsif (grep {/(openbsd[\s-]vmm)/i} @vm_data){
+			$vm = 'vmm';
+		}
+		elsif (grep {/(\bhvm\b)/i} @vm_data){
+			$vm = 'hvm';
+		}
+		elsif (grep {/(qemu)/i} @vm_data){
+			$vm = 'qemu';
+		}
+		elsif (grep {/(\bkvm\b|qumranet|virtio)/i} @vm_data){
+			$vm = 'kvm';
+		}
+		elsif (grep {/Virtual HD|Microsoft.*Virtual Machine/i} @vm_data){
 			$vm = 'hyper-v';
 		}
-		if (!$vm && (my $file = main::system_files('cpuinfo'))){
+		if (!$vm && (my $file = $system_files{'proc-cpuinfo'})){
 			my @info = main::reader($file);
 			$vm = 'virtual-machine' if grep {/^flags.*hypervisor/} @info;
 		}
-		if (!$vm && -e '/dev/vda' || -e '/dev/vdb' || -e '/dev/xvda' || -e '/dev/xvdb' ){
+		# this may be wrong, confirm it
+		if (!$vm && -e '/dev/vda' || -e '/dev/vdb' || -e '/dev/xvda' || -e '/dev/xvdb'){
 			$vm = 'virtual-machine';
 		}
 	}
-	if (!$vm  && $product_name){
+	if (!$vm && $product_name){
 		if ($product_name eq 'VMware'){
 			$vm = 'vmware';
 		}
@@ -12964,15 +14077,15 @@ sub get_device_vm {
 
 }
 
-## NetworkData 
+## NetworkItem 
 {
-package NetworkData;
+package NetworkItem;
 my ($b_ip_run,@ifs_found);
 sub get {
 	eval $start if $b_log;
 	my (@rows);
 	my $num = 0;
-	if (($b_arm || $b_mips) && !$b_soc_net && !$b_pci_tool){
+	if (($b_arm || $b_mips) && !$use{'soc-network'} && !$use{'pci-tool'}){
 		# do nothing, but keep the test conditions to force 
 		# the non arm case to always run
 	}
@@ -12981,12 +14094,24 @@ sub get {
 	}
 	push(@rows,usb_output());
 	# note: rasberry pi uses usb networking only 
-	if (!@rows && ($b_arm || $b_mips)){
-		my $type = ($b_arm) ? 'arm' : 'mips';
-		my $key = 'Message';
-		push(@rows, {
-		main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
-		},);
+	if (!@rows){
+		if ($b_arm || $b_mips){
+			my $type = ($b_arm) ? 'arm' : 'mips';
+			my $key = 'Message';
+			push(@rows, {
+			main::key($num++,0,1,$key) => main::row_defaults($type . '-pci',''),
+			},);
+		}
+		else {
+			my $key = 'Message';
+			my $type = 'pci-card-data';
+			if ($pci_tool && $alerts{$pci_tool}->{'action'} eq 'permissions'){
+				$type = 'pci-card-data-root';
+			}
+			push(@rows,{
+			main::key($num++,0,1,$key) => main::row_defaults($type,''),
+			},);
+		}
 	}
 	if ($show{'network-advanced'}){
 		# @ifs_found = ();
@@ -13008,12 +14133,13 @@ sub get {
 
 sub device_output {
 	eval $start if $b_log;
+	return if !$devices{'network'};
 	my ($b_wifi,@rows,%holder);
 	my ($j,$num) = (0,1);
-	foreach my $row (@devices_network){
+	foreach my $row (@{$devices{'network'}}){
 		$num = 1;
-		#print "$row->[0] $row->[3]\n"; 
-		#print "$row->[0] $row->[3]\n";
+		# print "$row->[0] $row->[3]\n"; 
+		# print "$row->[0] $row->[3]\n";
 		$j = scalar @rows;
 		my $driver = $row->[9];
 		my $chip_id = "$row->[5]:$row->[6]";
@@ -13026,14 +14152,14 @@ sub device_output {
 		}
 		# first check if it's a known wifi id'ed card, if so, no print of duplex/speed
 		$b_wifi = check_wifi($row->[4]);
-		my $card = $row->[4];
-		$card = ($card) ? main::pci_cleaner($card,'output') : 'N/A';
-		#$card ||= 'N/A';
+		my $device = $row->[4];
+		$device = ($device) ? main::pci_cleaner($device,'output') : 'N/A';
+		#$device ||= 'N/A';
 		$driver ||= 'N/A';
 		push(@rows, {
-		main::key($num++,1,1,'Device') => $card,
+		main::key($num++,1,1,'Device') => $device,
 		},);
-		if ($extra > 0 && $b_pci_tool && $row->[12]){
+		if ($extra > 0 && $use{'pci-tool'} && $row->[12]){
 			my $item = main::get_pci_vendor($row->[4],$row->[12]);
 			$rows[$j]->{main::key($num++,0,2,'vendor')} = $item if $item;
 		}
@@ -13059,14 +14185,14 @@ sub device_output {
 			}
 			$row->[8] ||= 'N/A';
 			# as far as I know, wifi has no port, but in case it does in future, use it
-			$rows[$j]->{main::key($num++,0,2,'port')} = $row->[8] if (!$b_wifi || ( $b_wifi && $row->[8] ne 'N/A') );
-			$rows[$j]->{main::key($num++,0,2,'bus ID')} = $bus_id;
+			$rows[$j]->{main::key($num++,0,2,'port')} = $row->[8] if (!$b_wifi || ($b_wifi && $row->[8] ne 'N/A'));
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = $bus_id;
 		}
 		if ($extra > 1){
-			$rows[$j]->{main::key($num++,0,2,'chip ID')} = $chip_id;
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $chip_id;
 		}
 		if ($extra > 2 && $row->[1]){
-			$rows[$j]->{main::key($num++,0,2,'class ID')} = $row->[1];
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = $row->[1];
 		}
 		if ($show{'network-advanced'}){
 			my @data;
@@ -13078,7 +14204,7 @@ sub device_output {
 			}
 			push(@rows,@data) if @data;
 		}
-		#print "$row->[0]\n";
+		# print "$row->[0]\n";
 	}
 	# @rows = ();
 	# we want to handle ARM errors in main get
@@ -13097,61 +14223,53 @@ sub device_output {
 }
 sub usb_output {
 	eval $start if $b_log;
-	my (@rows,@temp2,$b_wifi,$driver,
-	$path,$path_id,$product,$test,$type);
+	return if !$usb{'network'};
+	my (@rows,@temp2,$b_wifi,$driver,$path,$path_id,$product,$type);
 	my ($j,$num) = (0,1);
-	return if !@usb;
-	foreach my $row (@usb){
-		# a device will always be the second or > device on the bus, except for 
-		# daisychained hubs
-		if ($row->[1] > 1 && $row->[4] ne '09'){
-			$num = 1;
-			($driver,$path,$path_id,$product,$test,$type) = ('','','','','','');
-			$product = main::cleaner($row->[13]) if $row->[13];
-			$driver = $row->[15] if $row->[15];
-			$path = $row->[3] if $row->[3];
-			$path_id = $row->[2] if $row->[2];
-			$type = $row->[14] if $row->[14];
-			$test = "$driver $product $type";
-			if ($product && network_device($test)){
-				$driver ||= 'usb-network';
-				push(@rows, {
-				main::key($num++,1,1,'Device') => $product,
-				main::key($num++,0,2,'type') => 'USB',
-				main::key($num++,0,2,'driver') => $driver,
-				},);
-				$b_wifi = check_wifi($product);
-				if ($extra > 0){
-					$rows[$j]->{main::key($num++,0,2,'bus ID')} = "$path_id:$row->[1]";
-				}
-				if ($extra > 1){
-					$rows[$j]->{main::key($num++,0,2,'chip ID')} = $row->[7];
-				}
-				if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
-					$rows[$j]->{main::key($num++,0,2,'class ID')} = "$row->[4]$row->[5]";
-				}
-				if ($extra > 2 && $row->[16]){
-					$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
-				}
-				if ($show{'network-advanced'}){
-					my @data;
-					if (!$bsd_type){
-						my (@temp,$vendor,$chip);
-						@temp = split(':', $row->[7]) if $row->[7];
-						($vendor,$chip) = ($temp[0],$temp[1]) if @temp;
-						@data = advanced_data_sys($vendor,$chip,0,$b_wifi,$path,'');
-					}
-					# NOTE: we need the driver.number, like wlp0 to get a match, and 
-					# we can't get that from usb data, so we have to let it fall back down 
-					# to the check function for BSDs.
-					#else {
-					#	@data = advanced_data_bsd($row->[2],$b_wifi);
-					#}
-					push(@rows,@data) if @data;
-				}
-				$j = scalar @rows;
+	foreach my $row (@{$usb{'network'}}){
+		$num = 1;
+		($driver,$path,$path_id,$product,$type) = ('','','','','');
+		$product = main::cleaner($row->[13]) if $row->[13];
+		$driver = $row->[15] if $row->[15];
+		$path = $row->[3] if $row->[3];
+		$path_id = $row->[2] if $row->[2];
+		$type = $row->[14] if $row->[14];
+		$driver ||= 'N/A';
+		push(@rows, {
+		main::key($num++,1,1,'Device') => $product,
+		main::key($num++,0,2,'type') => 'USB',
+		main::key($num++,0,2,'driver') => $driver,
+		},);
+		$b_wifi = check_wifi($product);
+		if ($extra > 0){
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = "$path_id:$row->[1]";
+		}
+		if ($extra > 1){
+			$row->[7] ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $row->[7];
+		}
+		if ($extra > 2 && defined $row->[5] && $row->[5] ne ''){
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = "$row->[4]$row->[5]";
+		}
+		if ($extra > 2 && $row->[16]){
+			$rows[$j]->{main::key($num++,0,2,'serial')} = main::apply_filter($row->[16]);
+		}
+		if ($show{'network-advanced'}){
+			my @data;
+			if (!$bsd_type){
+				my (@temp,$vendor,$chip);
+				@temp = split(':', $row->[7]) if $row->[7];
+				($vendor,$chip) = ($temp[0],$temp[1]) if @temp;
+				@data = advanced_data_sys($vendor,$chip,0,$b_wifi,$path,'');
+			}
+			# NOTE: we need the driver + driver nu, like wlp0 to get a match,
+			else {
+				$driver .= $row->[21] if defined $row->[21];
+				@data = advanced_data_bsd($driver,$b_wifi);
 			}
+			push(@rows,@data) if @data;
 		}
+		$j = scalar @rows;
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -13174,7 +14292,7 @@ sub advanced_data_sys {
 		@paths = main::globber('/sys/class/net/*');
 	}
 	@paths = grep {!/\/lo$/} @paths;
-	if ( $count > 0 && $count < scalar @paths ){
+	if ($count > 0 && $count < scalar @paths){
 		@paths = splice(@paths, $count, scalar @paths);
 	}
 	if ($vendor eq 'check'){
@@ -13182,12 +14300,13 @@ sub advanced_data_sys {
 		$key = 'IF-ID';
 		($cont_if,$ind_if) = (1,2);
 	}
-	#print join('; ', @paths),  $count, "\n";
+	# print join('; ', @paths),  $count, "\n";
 	foreach (@paths){
 		my ($data1,$data2,$duplex,$mac,$speed,$state);
 		# for usb, we already know where we are
 		if (!$b_usb){
-			if (( !$b_arm && !$b_ppc) || $b_pci_tool ){
+			# pi mmcnr has pcitool and also these vendor/device paths.
+			if ((!$b_arm && !$b_ppc) || $use{'pci-tool'}){
 				$path = "$_/device/vendor";
 				$data1 = main::reader($path,'',0) if -r $path;
 				$data1 =~ s/^0x// if $data1;
@@ -13197,19 +14316,18 @@ sub advanced_data_sys {
 				# this is a fix for a redhat bug in virtio 
 				$data2 = (defined $data2 && $data2 eq '0001' && defined $chip && $chip eq '1000') ? '1000' : $data2;
 			}
-			elsif ($b_arm || $b_ppc) {
-				$path = Cwd::abs_path($_);
-				$path =~ /($chip)/;
-				if ($1){
-					$data1 = $vendor;
-					$data2 = $chip;
-				}
+			# there are cases where arm devices have a small pci bus
+			# or, with mmcnr devices, will show device/vendor info in data1/2
+			# which won't match with the path IDs
+			if (($b_arm || $b_ppc || $b_mips || $b_sparc) && $chip && Cwd::abs_path($_) =~ /\b$chip\b/){
+				$data1 = $vendor;
+				$data2 = $chip;
 			}
 		}
 		# print "d1:$data1 v:$vendor d2:$data2 c:$chip bus_id: $bus_id\n";
 		# print Cwd::abs_path($_), "\n" if $bus_id;
-		if ( $b_usb || $b_check || ( $data1 && $data2 && $data1 eq $vendor && $data2 eq $chip && 
-		( ($b_arm || $b_mips || $b_ppc || $b_sparc) || check_bus_id($_,$bus_id) ) ) ) {
+		if ($b_usb || $b_check || ($data1 && $data2 && $data1 eq $vendor && $data2 eq $chip && 
+		 (($b_arm || $b_mips || $b_ppc || $b_sparc) || check_bus_id($_,$bus_id)))){
 			$if = $_;
 			$if =~ s/^\/.+\///;
 			# print "top: if: $if ifs: @ifs_found\n";
@@ -13226,22 +14344,22 @@ sub advanced_data_sys {
 			$path = "$_/operstate";
 			$state = main::reader($path,'',0) if -r $path;
 			$state ||= 'N/A';
-			#print "$speed \n";
+			# print "$speed \n";
 			@row = ({
 			main::key($num++,1,$cont_if,$key) => $if,
 			main::key($num++,0,$ind_if,'state') => $state,
 			},);
-			#my $j = scalar @row - 1;
+			# my $j = scalar @row - 1;
 			push(@ifs_found, $if) if (!$b_check && (! grep {/$if/} @ifs_found));
 			# print "push: if: $if ifs: @ifs_found\n";
 			# no print out for wifi since it doesn't have duplex/speed data available
 			# note that some cards show 'unknown' for state, so only testing explicitly
 			# for 'down' string in that to skip showing speed/duplex
-			# /sys/class/net/$if/wireless : nont always there, but worth a try: wlan/wl/ww/wlp
-			$b_wifi = 1 if !$b_wifi && ( -e "$_$if/wireless" || $if =~ /^(wl|ww)/);
+			# /sys/class/net/$if/wireless : not always there, but worth a try: wlan/wl/ww/wlp
+			$b_wifi = 1 if !$b_wifi && (-e "$_$if/wireless" || $if =~ /^(wl|ww)/);
 			if (!$b_wifi && $state ne 'down' && $state ne 'no'){
 				# make sure the value is strictly numeric before appending Mbps
-				$speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
+				$speed = (main::is_int($speed)) ? "$speed Mbps" : $speed;
 				$row[0]->{main::key($num++,0,$ind_if,'speed')} = $speed;
 				$row[0]->{main::key($num++,0,$ind_if,'duplex')} = $duplex;
 			}
@@ -13286,7 +14404,7 @@ sub advanced_data_bsd {
  		else {
 			@data = @$item;
  		}
-		if ( $b_check || $working_if eq $if){
+		if ($b_check || $working_if eq $if){
 			$if = $working_if if $b_check;
 			# print "top: if: $if ifs: @ifs_found\n";
 			next if ($b_check && grep {/$if/} @ifs_found);
@@ -13299,19 +14417,19 @@ sub advanced_data_bsd {
 				$speed ||= 'N/A';
 				$state = $data[0];
 				$state ||= 'N/A';
-				#print "$speed \n";
+				# print "$speed \n";
 				@row = ({
 				main::key($num++,1,$cont_if,$key) => $if,
 				main::key($num++,0,$ind_if,'state') => $state,
 				},);
-				push(@ifs_found, $if) if (!$b_check && (! grep {/$if/} @ifs_found ));
+				push(@ifs_found, $if) if (!$b_check && (!grep {/$if/} @ifs_found));
 				# print "push: if: $if ifs: @ifs_found\n";
 				# no print out for wifi since it doesn't have duplex/speed data available
 				# note that some cards show 'unknown' for state, so only testing explicitly
 				# for 'down' string in that to skip showing speed/duplex
-				if (!$b_wifi && $state ne 'down' && $state ne 'no'){
+				if (!$b_wifi && $state ne 'down' && $state ne 'no network'){
 					# make sure the value is strictly numeric before appending Mbps
-					$speed = ( main::is_int($speed) ) ? "$speed Mbps" : $speed;
+					$speed = (main::is_int($speed)) ? "$speed Mbps" : $speed;
 					$row[0]->{main::key($num++,0,$ind_if,'speed')} = $speed;
 					$row[0]->{main::key($num++,0,$ind_if,'duplex')} = $duplex;
 				}
@@ -13365,7 +14483,7 @@ sub if_ip {
 					},);
 					last OUTER;
 				}
-				#print "$data2->[0] $data2->[1]\n";
+				# print "$data2->[0] $data2->[1]\n";
 				my ($ipv,$ip,$broadcast,$scope,$scope_id);
 				$ipv = ($data2->[0])? $data2->[0]: 'N/A';
 				$ip = main::apply_filter($data2->[1]);
@@ -13384,7 +14502,7 @@ sub if_ip {
 						# scope link 
 						# trim off if at end of multi word string if found
 						$data2->[4] =~ s/\s$if$// if $data2->[4] =~ /[^\s]+\s$if$/;
-						my $key = ($data2->[4] =~ /deprecated|dynamic|temporary|noprefixroute/ ) ? 'type':'virtual' ;
+						my $key = ($data2->[4] =~ /deprecated|dynamic|temporary|noprefixroute/) ? 'type' : 'virtual';
 						push(@rows, {
 						main::key($num++,1,$cont_ip,"IP v$ipv") => $ip,
 						main::key($num++,0,$ind_ip,$key) => $data2->[4],
@@ -13400,7 +14518,7 @@ sub if_ip {
 				}
 				else {
 					push(@rows, {
-					main::key($num++,1,($cont_ip - 1 ),'IF') => $if,
+					main::key($num++,1,($cont_ip - 1),'IF') => $if,
 					main::key($num++,1,$cont_ip,"IP v$ipv") => $ip,
 					main::key($num++,0,$ind_ip,'scope') => $scope,
 					},);
@@ -13418,8 +14536,8 @@ sub if_ip {
 # get ip using downloader to stdout. This is a clean, text only IP output url,
 # single line only, ending in the ip address. May have to modify this in the future
 # to handle ipv4 and ipv6 addresses but should not be necessary.
-# ip=$( echo  2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk  --re-interval '
-# ip=$( wget -q -O - $WAN_IP_URL | gawk  --re-interval '
+# ip=$(echo  2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk  --re-interval '
+# ip=$(wget -q -O - $WAN_IP_URL | gawk  --re-interval '
 # this generates a direct dns based ipv4 ip address, but if opendns.com goes down, 
 # the fall backs will still work. 
 # note: consistently slower than domain based: 
@@ -13436,11 +14554,11 @@ sub wan_ip {
 	# dig +short @ns1-1.akamaitech.net ANY whoami.akamai.net
 	# this one can take forever, and sometimes requires explicit -4 or -6
 	# dig -4 TXT +short o-o.myaddr.l.google.com @ns1.google.com
-	if (!$b_skip_dig && (my $program = main::check_program('dig') )){
+	if (!$force{'no-dig'} && (my $program = main::check_program('dig'))){
 		$ip = (main::grabber("$program +short +time=1 +tries=1 \@ns1-1.akamaitech.net ANY whoami.akamai.net 2>/dev/null"))[0];
 		$b_dig = 1;
 	}
-	if (!$ip && !$b_no_html_wan) {
+	if (!$ip && !$force{'no-html-wan'}){
 		# note: tests: akamai: 0.055 - 0.065 icanhazip.com: 0.177 0.164
 		# smxi: 0.525, so almost 10x slower. Dig is fast too
 		# leaving smxi as last test because I know it will always be up.
@@ -13449,7 +14567,7 @@ sub wan_ip {
 		# 0.255s: https://get.geojs.io/v1/ip
 		# 0.371s: http://icanhazip.com/
 		# 0.430s: https://smxi.org/opt/ip.php
-		my @urls = (!$wan_url) ? qw( http://whatismyip.akamai.com/ 
+		my @urls = (!$wan_url) ? qw(http://whatismyip.akamai.com/ 
 		 http://icanhazip.com/ https://smxi.org/opt/ip.php) : ($wan_url);
 		foreach (@urls){
 			$ua = 'ip' if $_ =~ /smxi/;
@@ -13484,46 +14602,6 @@ sub wan_ip {
 	eval $end if $b_log;
 	return @data;
 }
-
-### USB networking search string data, because some brands can have other products than
-### wifi/nic cards, they need further identifiers, with wildcards.
-### putting the most common and likely first, then the less common, then some specifics
-
-# Wi-Fi.*Adapter Wireless.*Adapter Ethernet.*Adapter WLAN.*Adapter 
-# Network.*Adapter 802\.11 Atheros Atmel D-Link.*Adapter D-Link.*Wireless Linksys 
-# Netgea Ralink Realtek.*Network Realtek.*Wireless Realtek.*WLAN Belkin.*Wireless 
-# Belkin.*WLAN Belkin.*Network Actiontec.*Wireless Actiontec.*Network AirLink.*Wireless 
-# Asus.*Network Asus.*Wireless Buffalo.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless 
-# ENUWI-.*Wireless LG.*Wi-Fi Rosewill.*Wireless RNX-.*Wireless Samsung.*LinkStick 
-# Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless 
-# WG[0-9][0-9][0-9].*Wireless WNA[0-9][0-9][0-9] WNDA[0-9][0-9][0-9] 
-# Zonet.*ZEW.*Wireless
-sub network_device {
-	eval $start if $b_log;
-	my ($device_string) = @_;
-	my ($b_network);
-	# belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda; 
-	# Atmel makes other stuff. NOTE: exclude 'networks': IMC Networks
-	my @tests = qw(wifi Wi-Fi.*Adapter Ethernet \bLAN\b WLAN Network\b Networking\b 
-	802\.1[15] 802\.3
-	Wireless.*Adapter 54\sMbps 100\/1000 NBase-T Mobile\sBroadband Atheros D-Link.*Adapter 
-	Dell.*Wireless D-Link.*Wireless Linksys Netgea Ralink Realtek.*Network Realtek.*Wireless
-	Belkin.*Wireless Actiontec.*Wireless AirLink.*Wireless Asus.*Wireless 
-	Buffalo.*Wireless Davicom DWA-.*RangeBooster DWA-.*Wireless
-	ENUWI-.*Wireless LG.*Wi-Fi Rosewill.*Wireless RNX-.*Wireless Samsung.*LinkStick 
-	Samsung.*Wireless Sony.*Wireless TEW-.*Wireless TP-Link.*Wireless 
-	WG[0-9][0-9][0-9].*Wireless WNA[0-9][0-9][0-9] WNDA[0-9][0-9][0-9] 
-	Zonet.*ZEW.*Wireless 050d:935b 0bda:8189 0bda:8197
-	);
-	foreach (@tests){
-		if ($device_string =~ /$_/i ){
-			$b_network = 1;
-			last;
-		}
-	}
-	eval $end if $b_log;
-	return $b_network;
-}
 sub check_bus_id {
 	eval $start if $b_log;
 	my ($path,$bus_id) = @_;
@@ -13532,8 +14610,8 @@ sub check_bus_id {
 		# legacy, not link, but uevent has path: 
 		# PHYSDEVPATH=/devices/pci0000:00/0000:00:0a.1/0000:05:00.0
 		if (Cwd::abs_path($path) =~ /$bus_id\// || 
-		 ( -r "$path/uevent" && -s "$path/uevent" && 
-		 (grep {/$bus_id/} main::reader("$path/uevent") ) ) ){
+		 (-r "$path/uevent" && -s "$path/uevent" && 
+		 (grep {/$bus_id/} main::reader("$path/uevent")))){
 			$b_valid = 1;
 		}
 	}
@@ -13542,31 +14620,29 @@ sub check_bus_id {
 }
 sub check_wifi {
 	my ($item) = @_;
-	my $b_wifi = ($item =~ /wireless|wifi|wi-fi|wlan|802\.11|centrino/i) ? 1 : 0;
+	my $b_wifi = ($item =~ /wireless|wi-?fi|wlan|802\.11|centrino/i) ? 1 : 0;
 	return $b_wifi;
 }
 }
 
-## OpticalData
+## OpticalItem
 {
-package OpticalData;
-
+package OpticalItem;
 sub get {
 	eval $start if $b_log;
 	my (%data,@rows,$key1,$val1);
 	my $num = 0;
 	if ($bsd_type){
-		#%data = optical_data_bsd();
 		$key1 = 'Optical Report';
 		$val1 = main::row_defaults('optical-data-bsd');
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
-		if ( @dm_boot_optical){
-			%data = optical_data_bsd();
-			@rows = optical_output(\%data) if %data;
+		if ($dboot{'optical'}){
+			%data = drive_data_bsd();
+			@rows = drive_output(\%data) if %data;
 		}
 		else{
-			my $file = main::system_files('dmesg-boot');
-			if ( $file && ! -r $file ){
+			my $file = $system_files{'dmesg-boot'};
+			if ($file && ! -r $file){
 				$val1 = main::row_defaults('dmesg-boot-permissions');
 			}
 			elsif (!$file){
@@ -13580,8 +14656,8 @@ sub get {
 		}
 	}
 	else {
-		%data = optical_data_linux();
-		@rows = optical_output(\%data) if %data;
+		%data = drive_data_linux();
+		@rows = drive_output(\%data) if %data;
 	}
 	if (!@rows){
 		$key1 = 'Message';
@@ -13591,71 +14667,71 @@ sub get {
 	eval $end if $b_log;
 	return @rows;
 }
-sub optical_output {
+sub drive_output {
 	eval $start if $b_log;
-	my ($devices) = @_;
+	my ($drives) = @_;
 	my (@rows);
 	my $num = 0;
 	my $j = 0;
 	# build floppy if any
-	foreach my $key (sort keys %$devices){
-		if ($devices->{$key}{'type'} eq 'floppy'){
+	foreach my $key (sort keys %$drives){
+		if ($drives->{$key}{'type'} eq 'floppy'){
 			push(@rows, {
-			main::key($num++,0,1,ucfirst($devices->{$key}{'type'})) => "/dev/$key",
+			main::key($num++,0,1,ucfirst($drives->{$key}{'type'})) => "/dev/$key",
 			});
-			delete $devices->{$key};
+			delete $drives->{$key};
 		}
 	}
-	foreach my $key (sort keys %$devices){
+	foreach my $key (sort keys %$drives){
 		$j = scalar @rows;
 		$num = 1;
-		my $vendor = $devices->{$key}{'vendor'};
+		my $vendor = $drives->{$key}{'vendor'};
 		$vendor ||= 'N/A';
-		my $model = $devices->{$key}{'model'};
+		my $model = $drives->{$key}{'model'};
 		$model ||= 'N/A';
 		push(@rows, { 
-		main::key($num++,1,1,ucfirst($devices->{$key}{'type'})) => "/dev/$key",
+		main::key($num++,1,1,ucfirst($drives->{$key}{'type'})) => "/dev/$key",
 		main::key($num++,0,2,'vendor') => $vendor,
 		main::key($num++,0,2,'model') => $model,
 		});
 		if ($extra > 0){
-			my $rev = $devices->{$key}{'rev'};
+			my $rev = $drives->{$key}{'rev'};
 			$rev ||= 'N/A';
 			$rows[$j]->{ main::key($num++,0,2,'rev')} = $rev;
 		}
-		if ($extra > 1 && $devices->{$key}{'serial'}){
-			$rows[$j]->{ main::key($num++,0,2,'serial')} = main::apply_filter($devices->{$key}{'serial'});
+		if ($extra > 1 && $drives->{$key}{'serial'}){
+			$rows[$j]->{ main::key($num++,0,2,'serial')} = main::apply_filter($drives->{$key}{'serial'});
 		}
-		my $links = (@{$devices->{$key}{'links'}}) ? join(',', sort @{$devices->{$key}{'links'}}) : 'N/A' ;
+		my $links = (@{$drives->{$key}{'links'}}) ? join(',', sort @{$drives->{$key}{'links'}}) : 'N/A' ;
 		$rows[$j]->{ main::key($num++,0,2,'dev-links')} = $links;
 		if ($show{'optical'}){
 			$j = scalar @rows;
-			my $speed = $devices->{$key}{'speed'};
+			my $speed = $drives->{$key}{'speed'};
 			$speed ||= 'N/A';
 			my ($audio,$multisession) = ('','');
-			if (defined $devices->{$key}{'multisession'}){
-				$multisession = ( $devices->{$key}{'multisession'} == 1 ) ? 'yes' : 'no' ;
+			if (defined $drives->{$key}{'multisession'}){
+				$multisession = ($drives->{$key}{'multisession'} == 1) ? 'yes' : 'no' ;
 			}
 			$multisession ||= 'N/A';
-			if (defined $devices->{$key}{'audio'}){
-				$audio = ( $devices->{$key}{'audio'} == 1 ) ? 'yes' : 'no' ;
+			if (defined $drives->{$key}{'audio'}){
+				$audio = ($drives->{$key}{'audio'} == 1) ? 'yes' : 'no' ;
 			}
 			$audio ||= 'N/A';
 			my $dvd = 'N/A';
 			my (@rw,$rws);
-			if (defined $devices->{$key}{'dvd'}){
-				$dvd = ( $devices->{$key}{'dvd'} == 1 ) ? 'yes' : 'no' ;
+			if (defined $drives->{$key}{'dvd'}){
+				$dvd = ($drives->{$key}{'dvd'} == 1) ? 'yes' : 'no' ;
 			}
-			if ($devices->{$key}{'cdr'}){
+			if ($drives->{$key}{'cdr'}){
 				push(@rw, 'cd-r');
 			}
-			if ($devices->{$key}{'cdrw'}){
+			if ($drives->{$key}{'cdrw'}){
 				push(@rw, 'cd-rw');
 			}
-			if ($devices->{$key}{'dvdr'}){
+			if ($drives->{$key}{'dvdr'}){
 				push(@rw, 'dvd-r');
 			}
-			if ($devices->{$key}{'dvdram'}){
+			if ($drives->{$key}{'dvdram'}){
 				push(@rw, 'dvd-ram');
 			}
 			$rws = (@rw) ? join(',', @rw) : 'none' ;
@@ -13667,22 +14743,22 @@ sub optical_output {
 			main::key($num++,0,3,'dvd') => $dvd,
 			main::key($num++,0,3,'rw') => $rws,
 			});
-			if ($extra > 0 ){
-				my $state = $devices->{$key}{'state'};
+			if ($extra > 0){
+				my $state = $drives->{$key}{'state'};
 				$state ||= 'N/A';
 				$rows[$j]->{ main::key($num++,0,3,'state')} = $state;
 			}
 		}
 	}
-	#print Data::Dumper::Dumper \%devices;
+	# print Data::Dumper::Dumper \%drives;
 	eval $end if $b_log;
 	return @rows;
 }
-sub optical_data_bsd {
+sub drive_data_bsd {
 	eval $start if $b_log;
-	my (%devices,@rows,@temp);
+	my (%drives,@rows,@temp);
 	my ($count,$i,$working) = (0,0,'');
-	foreach (@dm_boot_optical){
+	foreach (@{$dboot{'optical'}}){
 		$_ =~ s/(cd[0-9]+)\(([^:]+):([0-9]+):([0-9]+)\):/$1:$2-$3.$4,/;
 		my @row = split(/:\s*/, $_);
 		next if ! defined $row[1];
@@ -13691,100 +14767,100 @@ sub optical_data_bsd {
 			$working = $row[0];
 		}
 		# no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s 
-		if (! exists $devices{$working}){
-			$devices{$working}->{'links'} = ([]);
-			$devices{$working}->{'model'} = '';
-			$devices{$working}->{'rev'} = '';
-			$devices{$working}->{'state'} = '';
-			$devices{$working}->{'vendor'} = '';
-			$devices{$working}->{'temp'} = '';
-			$devices{$working}->{'type'} = ($working =~ /^cd/) ? 'optical' : 'unknown';
-		}
-		#print "$_\n";
-		if ($bsd_type ne 'openbsd'){
+		if (!exists $drives{$working}){
+			$drives{$working}->{'links'} = [];
+			$drives{$working}->{'model'} = '';
+			$drives{$working}->{'rev'} = '';
+			$drives{$working}->{'state'} = '';
+			$drives{$working}->{'vendor'} = '';
+			$drives{$working}->{'temp'} = '';
+			$drives{$working}->{'type'} = ($working =~ /^cd/) ? 'optical' : 'unknown';
+		}
+		# print "$_\n";
+		if ($bsd_type !~ /^(net|open)bsd$/){
 			if ($row[1] && $row[1] =~ /^<([^>]+)>/){
-				$devices{$working}->{'model'} = $1;
-				$count = ($devices{$working}->{'model'} =~ tr/ //);
+				$drives{$working}->{'model'} = $1;
+				$count = ($drives{$working}->{'model'} =~ tr/ //);
 				if ($count && $count > 1){
-					@temp = split(/\s+/, $devices{$working}->{'model'});
-					$devices{$working}->{'vendor'} = $temp[0];
-					my $index = ($#temp > 2 ) ? ($#temp - 1): $#temp;
-					$devices{$working}->{'model'} = join(' ', @temp[1..$index]);
-					$devices{$working}->{'rev'} = $temp[-1] if $count > 2;
+					@temp = split(/\s+/, $drives{$working}->{'model'});
+					$drives{$working}->{'vendor'} = $temp[0];
+					my $index = ($#temp > 2) ? ($#temp - 1): $#temp;
+					$drives{$working}->{'model'} = join(' ', @temp[1..$index]);
+					$drives{$working}->{'rev'} = $temp[-1] if $count > 2;
 				}
 				if ($show{'optical'}){
 					if (/\bDVD\b/){
-						$devices{$working}->{'dvd'} = 1;
+						$drives{$working}->{'dvd'} = 1;
 					}
 					if (/\bRW\b/){
-						$devices{$working}->{'cdrw'} = 1;
-						$devices{$working}->{'dvdr'} = 1 if $devices{$working}->{'dvd'};
+						$drives{$working}->{'cdrw'} = 1;
+						$drives{$working}->{'dvdr'} = 1 if $drives{$working}->{'dvd'};
 					}
 				}
 			}
 			if ($row[1] && $row[1] =~ /^Serial/){
 				@temp = split(/\s+/,$row[1]);
-				$devices{$working}->{'serial'} = $temp[-1];
+				$drives{$working}->{'serial'} = $temp[-1];
 			}
 			if ($show{'optical'}){
 				if ($row[1] =~ /^([0-9\.]+[MGTP][B]?\/s)/){
-					$devices{$working}->{'speed'} = $1;
-					$devices{$working}->{'speed'} =~ s/\.[0-9]+//;
+					$drives{$working}->{'speed'} = $1;
+					$drives{$working}->{'speed'} =~ s/\.[0-9]+//;
 				}
 				if (/\bDVD[-]?RAM\b/){
-					$devices{$working}->{'cdr'} = 1;
-					$devices{$working}->{'dvdram'} = 1;
+					$drives{$working}->{'cdr'} = 1;
+					$drives{$working}->{'dvdram'} = 1;
 				}
 				if ($row[2] && $row[2] =~ /,\s(.*)$/){
-					$devices{$working}->{'state'} = $1;
-					$devices{$working}->{'state'} =~ s/\s+-\s+/, /;
+					$drives{$working}->{'state'} = $1;
+					$drives{$working}->{'state'} =~ s/\s+-\s+/, /;
 				}
 			}
 		}
 		else {
 			if ($row[2] && $row[2] =~ /<([^>]+)>/){
-				$devices{$working}->{'model'} = $1;
-				$count = ($devices{$working}->{'model'} =~ tr/,//);
-				#print "c: $count $row[2]\n";
+				$drives{$working}->{'model'} = $1;
+				$count = ($drives{$working}->{'model'} =~ tr/,//);
+				# print "c: $count $row[2]\n";
 				if ($count && $count > 1){
-					@temp = split(/,\s*/, $devices{$working}->{'model'});
-					$devices{$working}->{'vendor'} = $temp[0];
-					$devices{$working}->{'model'} = $temp[1];
-					$devices{$working}->{'rev'} = $temp[2];
+					@temp = split(/,\s*/, $drives{$working}->{'model'});
+					$drives{$working}->{'vendor'} = $temp[0];
+					$drives{$working}->{'model'} = $temp[1];
+					$drives{$working}->{'rev'} = $temp[2];
 				}
 				if ($show{'optical'}){
 					if (/\bDVD\b/){
-						$devices{$working}->{'dvd'} = 1;
+						$drives{$working}->{'dvd'} = 1;
 					}
 					if (/\bRW\b/){
-						$devices{$working}->{'cdrw'} = 1;
-						$devices{$working}->{'dvdr'} = 1 if $devices{$working}->{'dvd'};
+						$drives{$working}->{'cdrw'} = 1;
+						$drives{$working}->{'dvdr'} = 1 if $drives{$working}->{'dvd'};
 					}
 					if (/\bDVD[-]?RAM\b/){
-						$devices{$working}->{'cdr'} = 1;
-						$devices{$working}->{'dvdram'} = 1;
+						$drives{$working}->{'cdr'} = 1;
+						$drives{$working}->{'dvdram'} = 1;
 					}
 				}
 			}
 			if ($show{'optical'}){
-				#print "$row[1]\n";
+				# print "$row[1]\n";
 				if (($row[1] =~ tr/,//) > 1){
 					@temp = split(/,\s*/, $row[1]);
-					$devices{$working}->{'speed'} = $temp[2];
+					$drives{$working}->{'speed'} = $temp[2];
 				}
 				
 			}
 		}
 	}
 	
-	main::log_data('dump','%devices',\%devices) if $b_log;
-	#print Data::Dumper::Dumper \%devices;
+	main::log_data('dump','%drives',\%drives) if $b_log;
+	# print Data::Dumper::Dumper \%drives;
 	eval $end if $b_log;
-	return %devices;
+	return %drives;
 }
-sub optical_data_linux {
+sub drive_data_linux {
 	eval $start if $b_log;
-	my (@data,%devices,@info,@rows);
+	my (@data,%drives,@info,@rows);
 	@data = main::globber('/dev/dvd* /dev/cdr* /dev/scd* /dev/sr* /dev/fd[0-9]');
 	# Newer kernel is NOT linking all optical drives. Some, but not all.
 	# Get the actual disk dev location, first try default which is easier to run, 
@@ -13796,36 +14872,36 @@ sub optical_data_linux {
 		# possible fix: puppy has these in /mnt not /dev they say
 		$working =~ s/\/(dev|media|mnt)\///;
 		$_ =~ s/\/(dev|media|mnt)\///;
-		if  (!defined $devices{$working}){
+		if  (!defined $drives{$working}){
 			my @temp = ($_ ne $working) ? ($_) : ();
-			$devices{$working}->{'links'} = \@temp;
-			$devices{$working}->{'type'} = ($working =~ /^fd/) ? 'floppy' : 'optical' ;
+			$drives{$working}->{'links'} = \@temp;
+			$drives{$working}->{'type'} = ($working =~ /^fd/) ? 'floppy' : 'optical' ;
 		}
  		else {
- 			push(@{$devices{$working}->{'links'}}, $_) if $_ ne $working;
+ 			push(@{$drives{$working}->{'links'}}, $_) if $_ ne $working;
  		}
-		#print "$working\n";
+		# print "$working\n";
 	}
 	if ($show{'optical'} && -e '/proc/sys/dev/cdrom/info'){
 		@info = main::reader('/proc/sys/dev/cdrom/info','strip');
 	}
-	#print join('; ', @data), "\n";
-	foreach my $key (keys %devices){
-		next if $devices{$key}->{'type'} eq 'floppy';
+	# print join('; ', @data), "\n";
+	foreach my $key (keys %drives){
+		next if $drives{$key}->{'type'} eq 'floppy';
 		my $device = "/sys/block/$key/device";
-		if ( -d $device){
+		if (-d $device){
 			if (-r "$device/vendor"){
-				$devices{$key}->{'vendor'} = main::reader("$device/vendor",'',0);
-				$devices{$key}->{'vendor'} = main::cleaner($devices{$key}->{'vendor'});
-				$devices{$key}->{'state'} = main::reader("$device/state",'',0);
-				$devices{$key}->{'model'} = main::reader("$device/model",'',0);
-				$devices{$key}->{'model'} = main::cleaner($devices{$key}->{'model'});
-				$devices{$key}->{'rev'} = main::reader("$device/rev",'',0);
+				$drives{$key}->{'vendor'} = main::reader("$device/vendor",'',0);
+				$drives{$key}->{'vendor'} = main::cleaner($drives{$key}->{'vendor'});
+				$drives{$key}->{'state'} = main::reader("$device/state",'',0);
+				$drives{$key}->{'model'} = main::reader("$device/model",'',0);
+				$drives{$key}->{'model'} = main::cleaner($drives{$key}->{'model'});
+				$drives{$key}->{'rev'} = main::reader("$device/rev",'',0);
 			}
 		}
-		elsif ( -r "/proc/ide/$key/model"){
-			$devices{$key}->{'vendor'} = main::reader("/proc/ide/$key/model",'',0);
-			$devices{$key}->{'vendor'} = main::cleaner($devices{$key}->{'vendor'});
+		elsif (-r "/proc/ide/$key/model"){
+			$drives{$key}->{'vendor'} = main::reader("/proc/ide/$key/model",'',0);
+			$drives{$key}->{'vendor'} = main::cleaner($drives{$key}->{'vendor'});
 		}
 		if ($show{'optical'} && @info){
 			my $index = 0;
@@ -13837,56 +14913,56 @@ sub optical_data_linux {
 						last if ($id eq $key);
 						$index++;
 					}
-					last if ! $index; # index will be > 0 if it was found
+					last if !$index; # index will be > 0 if it was found
 				}
-				elsif ($item =~/^drive speed:/) {
-					$devices{$key}->{'speed'} = $split[$index];
+				elsif ($item =~/^drive speed:/){
+					$drives{$key}->{'speed'} = $split[$index];
 				}
-				elsif ($item =~/^Can read multisession:/) {
-					$devices{$key}->{'multisession'}=$split[$index+1];
+				elsif ($item =~/^Can read multisession:/){
+					$drives{$key}->{'multisession'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can read MCN:/) {
-					$devices{$key}->{'mcn'}=$split[$index+1];
+				elsif ($item =~/^Can read MCN:/){
+					$drives{$key}->{'mcn'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can play audio:/) {
-					$devices{$key}->{'audio'}=$split[$index+1];
+				elsif ($item =~/^Can play audio:/){
+					$drives{$key}->{'audio'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can write CD-R:/) {
-					$devices{$key}->{'cdr'}=$split[$index+1];
+				elsif ($item =~/^Can write CD-R:/){
+					$drives{$key}->{'cdr'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can write CD-RW:/) {
-					$devices{$key}->{'cdrw'}=$split[$index+1];
+				elsif ($item =~/^Can write CD-RW:/){
+					$drives{$key}->{'cdrw'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can read DVD:/) {
-					$devices{$key}->{'dvd'}=$split[$index+1];
+				elsif ($item =~/^Can read DVD:/){
+					$drives{$key}->{'dvd'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can write DVD-R:/) {
-					$devices{$key}->{'dvdr'}=$split[$index+1];
+				elsif ($item =~/^Can write DVD-R:/){
+					$drives{$key}->{'dvdr'}=$split[$index+1];
 				}
-				elsif ($item =~/^Can write DVD-RAM:/) {
-					$devices{$key}->{'dvdram'}=$split[$index+1];
+				elsif ($item =~/^Can write DVD-RAM:/){
+					$drives{$key}->{'dvdram'}=$split[$index+1];
 				}
 			}
 		}
 	}
-	main::log_data('dump','%devices',\%devices) if $b_log;
-	#print Data::Dumper::Dumper \%devices;
+	main::log_data('dump','%drives',\%drives) if $b_log;
+	# print Data::Dumper::Dumper \%drives;
 	eval $end if $b_log;
-	return %devices;
+	return %drives;
 }
 
 }
 
-## PartitionData
+## PartitionItem
 {
-package PartitionData;
+package PartitionItem;
 
 sub get {
 	eval $start if $b_log;
 	my (@rows,$key1,$val1);
 	my $num = 0;
-	partition_data() if !$b_partitions;
- 	if (!@partitions) {
+	set_partitions() if !$loaded{'set-partitions'};
+ 	if (!@partitions){
 		$key1 = 'Message';
 		#$val1 = ($bsd_type && $bsd_type eq 'darwin') ? 
 		# main::row_defaults('darwin-feature') : main::row_defaults('partition-data');
@@ -13894,16 +14970,16 @@ sub get {
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
  	}
  	else {
-		@rows = partition_output();
+		@rows = create_output();
  	}
 	eval $end if $b_log;
 	return @rows;
 }
-sub partition_output {
+sub create_output {
 	eval $start if $b_log;
 	my $num = 0;
 	my $j = 0;
-	my (%part,@rows,$dev,$dev_type,$fs,$percent,$raw_size,$size,$used);
+	my (@rows,$dev,$dev_type,$fs,$percent,$raw_size,$size,$used);
 	# alpha sort for non numerics
 	if ($show{'partition-sort'} !~ /^(percent-used|size|used)$/){
 		@partitions = sort { $a->{$show{'partition-sort'}} cmp $b->{$show{'partition-sort'}} } @partitions;
@@ -13911,6 +14987,7 @@ sub partition_output {
 	else {
 		@partitions = sort { $a->{$show{'partition-sort'}} <=> $b->{$show{'partition-sort'}} } @partitions;
 	}
+	my $fs_skip = fs_excludes('label-uuid');
 	foreach my $row (@partitions){
 		$num = 1;
 		next if $row->{'type'} eq 'secondary' && $show{'partition'};
@@ -13918,14 +14995,13 @@ sub partition_output {
 		next if $row->{'swap-type'} && $row->{'swap-type'} ne 'partition';
 		if (!$row->{'hidden'}){
 			$size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
-			$used = ($row->{'used'}) ? main::get_size($row->{'used'},'string') : 'N/A';
+			$used = main::get_size($row->{'used'},'string','N/A'); # used can be 0
 			$percent = (defined $row->{'percent-used'}) ? ' (' . $row->{'percent-used'} . '%)' : '';
 		}
 		else {
 			$percent = '';
 			$used = $size = (!$b_root) ? main::row_defaults('root-required') : main::row_defaults('partition-hidden');
 		}
-		%part = ();
 		$fs = ($row->{'fs'}) ? lc($row->{'fs'}): 'N/A';
 		$dev_type = ($row->{'dev-type'}) ? $row->{'dev-type'} : 'dev';
 		$row->{'dev-base'} = '/dev/' . $row->{'dev-base'} if $dev_type eq 'dev' && $row->{'dev-base'};
@@ -13935,10 +15011,10 @@ sub partition_output {
 		push(@rows, {
 		main::key($num++,1,1,'ID') => $row->{'id'},
 		});
-		if (($b_admin || $row->{'hidden'}) && $row->{'raw-size'} ){
+		if (($b_admin || $row->{'hidden'}) && $row->{'raw-size'}){
 			# It's an error! permissions or missing tool
 			$raw_size = ($row->{'raw-size'}) ? main::get_size($row->{'raw-size'},'string') : 'N/A';
-			$rows[$j]->{main::key($num++,0,2,'raw size')} = $raw_size;
+			$rows[$j]->{main::key($num++,0,2,'raw-size')} = $raw_size;
 		}
 		if ($b_admin && $row->{'raw-available'} && $size ne 'N/A'){
 			$size .=  ' (' . $row->{'raw-available'} . '%)';
@@ -13950,13 +15026,13 @@ sub partition_output {
 			$rows[$j]->{main::key($num++,0,2,'swappiness')} = $row->{'swappiness'};
 		}
 		if ($b_admin && $fs eq 'swap' && defined $row->{'cache-pressure'}){
-			$rows[$j]->{main::key($num++,0,2,'cache pressure')} = $row->{'cache-pressure'};
+			$rows[$j]->{main::key($num++,0,2,'cache-pressure')} = $row->{'cache-pressure'};
 		}
 		if ($extra > 1 && $fs eq 'swap' && defined $row->{'priority'}){
 			$rows[$j]->{main::key($num++,0,2,'priority')} = $row->{'priority'};
 		}
 		if ($b_admin && $row->{'block-size'}){
-			$rows[$j]->{main::key($num++,0,2,'block size')} = $row->{'block-size'} . ' B';;
+			$rows[$j]->{main::key($num++,0,2,'block-size')} = $row->{'block-size'} . ' B';;
 			#$rows[$j]->{main::key($num++,0,2,'physical')} = $row->{'block-size'} . ' B';
 			#$rows[$j]->{main::key($num++,0,2,'logical')} = $row->{'block-logical'} . ' B';
 		}
@@ -13967,44 +15043,57 @@ sub partition_output {
 		if ($extra > 0 && $row->{'dev-mapped'}){
 			$rows[$j]->{main::key($num++,0,3,'mapped')} = $row->{'dev-mapped'};
 		}
-		if ($show{'label'}){
-			$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '') if $use{'filter-label'};
-			$rows[$j]->{main::key($num++,0,2,'label')} = ($row->{'label'}) ? $row->{'label'}: 'N/A';
-		}
-		if ($show{'uuid'}){
-			$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '') if $use{'filter-uuid'};
-			$rows[$j]->{main::key($num++,0,2,'uuid')} = ($row->{'uuid'}) ? $row->{'uuid'}: 'N/A';
+		# add fs known to not use label/uuid here
+		if (($show{'label'} || $show{'uuid'}) && 
+		 $dev_type eq 'dev' && $fs !~ /^(fuse(blk)?[\._-]?)?($fs_skip)$/){
+			if ($show{'label'}){
+				if ($use{'filter-label'}){
+					$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '');
+				}
+				$row->{'label'} ||= 'N/A';
+				$rows[$j]->{main::key($num++,0,2,'label')} = $row->{'label'};
+			}
+			if ($show{'uuid'}){
+				if ($use{'filter-uuid'}){
+					$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '');
+				}
+				$row->{'uuid'} ||= 'N/A';
+				$rows[$j]->{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
+			}
 		}
 	}
 	eval $end if $b_log;
 	return @rows;
 }
 
-sub partition_data {
+sub set_partitions {
 	eval $start if $b_log;
 	#return if $bsd_type && $bsd_type eq 'darwin'; # darwin has muated output, of course
 	my (@data,@rows,@mount,@partitions_working,%part,@working);
-	my ($b_fake_map,$b_fs,$b_load,$b_space,$cols,$roots) = (0,1,0,0,6,0);
-	my ($back_size,$back_used) = (4,3);
+	my ($back_size,$back_used,$b_fs,$cols,$roots) = (4,3,1,6,0);
+	my ($b_fake_map,$b_load,$b_logical,$b_space,);
 	my ($block_size,$blockdev,$dev_base,$dev_mapped,$dev_type,$fs,$id,$label,
 	$maj_min,$percent_used,$raw_size,$replace,$size_available,$size,$test,
 	$type,$uuid,$used);
-	$b_partitions = 1;
+	$loaded{'set-partitions'} = 1;
 	if ($b_admin){
 		# for partition block size
 		$blockdev = $alerts{'blockdev'}->{'path'} if $alerts{'blockdev'}->{'path'};
 	}
 	# for raw partition sizes, maj_min
-	main::set_proc_partitions() if !$bsd_type && !$b_proc_partitions;
-	main::set_lsblk() if !$bsd_type && !$b_lsblk;
-	# set labels, uuid, gpart
-	set_label_uuid() if !$b_label_uuid;
+	PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
+	DiskDataBSD::set() if $bsd_type && !$loaded{'disk-data-bsd'};
+	LsblkData::set() if !$bsd_type && !$loaded{'lsblk'};
+	# set @labels, @uuid
+	if (!$bsd_type){
+		set_label_uuid() if !$loaded{'label-uuid'};
+	}
 	# most current OS support -T and -k, but -P means different things
 	# in freebsd. However since most use is from linux, we make that default
 	# android 7 no -T support
 	if (!$bsd_type){
 		@partitions_working = main::grabber("df -P -T -k 2>/dev/null");
-		main::set_mapper() if !$b_mapper;
+		main::set_mapper() if !$loaded{'mapper'};
 	}
 	else {
 		# this is missing the file system data
@@ -14037,13 +15126,9 @@ sub partition_data {
 		$roots++ if /\s\/$/;
 	}
 	@partitions_working = grep {!/^rootfs/} @partitions_working if $roots > 1;
-	# IMPORTANT: check the lsblk completer tool check_partition_data() for matching lsblck
-	# filters.
-	my $filters = 'aufs|cgroup.*|cgmfs|configfs|debugfs|\/dev|dev|\/dev\/loop[0-9]*|';
-	$filters .= 'devfs|devtmpfs|fdescfs|iso9660|linprocfs|none|procfs|\/run(\/.*)?|';
-	$filters .= 'run|shm|squashfs|sys|\/sys\/.*|sysfs|tmpfs|type|udev|unionfs|vartmp';
-	#push @partitions_working, '//mafreebox.freebox.fr/Disque dur cifs         239216096  206434016  20607496      91% /freebox/Disque dur';
-	#push @partitions_working, '//mafreebox.freebox.fr/AllPG      cifs         436616192  316339304 120276888      73% /freebox/AllPG';
+	my $filters = partition_filters();
+	# push @partitions_working, '//mafreebox.freebox.fr/Disque dur cifs         239216096  206434016  20607496      91% /freebox/Disque dur';
+	# push @partitions_working, '//mafreebox.freebox.fr/AllPG      cifs         436616192  316339304 120276888      73% /freebox/AllPG';
 	foreach (@partitions_working){
 		# apple crap, maybe also freebsd?
 		$_ =~ s/^map\s+([\S]+)/map:\/$1/ if $b_fake_map;
@@ -14055,22 +15140,22 @@ sub partition_data {
 			if ($test =~ /\s/){
 				$b_space = 1;
 				$replace =~ s/\s/^^/g;
-				#print ":$replace:\n";
+				# print ":$replace:\n";
 				$_ =~ s/^$test/$replace/;
-				#print "$_\n";
+				# print "$_\n";
 			}
 		}
 		my @row = split(/\s+/, $_);
 		# autofs is a bsd thing, has size 0
 		if ($row[0] =~ /^($filters)$/ || $row[0] =~ /^ROOT/i || 
-		   ($b_fs && ($row[2] == 0 || $row[1] =~ /^(autofs|devtmpfs|iso9660|tmpfs)$/ ) )){
+		 ($b_fs && ($row[2] == 0 || $row[1] =~ /^(autofs|devtmpfs|iso9660|tmpfs)$/))){
 			next;
 		}
 		($dev_base,$dev_mapped,$dev_type,$fs,$id,$label,
 		$maj_min,$type,$uuid) = ('','','','','','','','','');
 		($b_load,$block_size,$percent_used,$raw_size,$size_available,
 		$size,$used) = (0,0,0,0,0,0,0,0);
-		%part = ();
+		undef %part;
 		# NOTE: using -P for linux fixes line wraps, and for bsds, assuming they don't use such long file names
 		if ($row[0] =~ /^\/dev\/|:\/|\/\//){
 			# this could point to by-label or by-uuid so get that first. In theory, abs_path should 
@@ -14094,15 +15179,16 @@ sub partition_data {
 			}
 			$dev_base = $row[0];
 			$dev_base =~ s|^/.*/||;
-			%part = main::get_lsblk($dev_base) if @lsblk;
+			%part = LsblkData::get($dev_base) if @lsblk;
 			$maj_min = get_maj_min($dev_base) if @proc_partitions;
 		}
 		# this handles zfs type devices/partitions, which do not start with / but contain /
 		# note: Main/jails/transmission_1 path can be > 1 deep 
 		# Main zfs 3678031340 8156 3678023184 0% /mnt/Main
-		if (!$dev_base && ($row[0] =~ /^([^\/]+\/)(.+)/ || ($row[0] =~ /^[^\/]+$/ && $row[1] =~ /^(btrfs|zfs)$/ ) ) ){
+		if (!$dev_base && ($row[0] =~ /^([^\/]+\/)(.+)/ || 
+		 ($row[0] =~ /^[^\/]+$/ && $row[1] =~ /^(btrfs|hammer[2-9]?|zfs)$/))){
 			$dev_base = $row[0];
-			$dev_type = 'raid';
+			$dev_type = 'logical';
 		}
 		# this handles yet another fredforfaen special case where a mounted drive
 		# has the search string in its name, includes / (|
@@ -14122,38 +15208,33 @@ sub partition_data {
 		if ($b_load){
 			if (!$bsd_type){
 				if ($b_fs){
-					$fs = (%part && $part{'fs'}) ? $part{'fs'} : $row[1];
+					$fs = ($part{'fs'}) ? $part{'fs'} : $row[1];
 				}
 				else {
 					$fs = get_mounts_fs($row[0],\@mount);
 				}
-				if ($show{'label'}) {
-					if (%part && $part{'label'}) {
+				if ($show{'label'}){
+					if ($part{'label'}){
 						$label = $part{'label'};
 					}
-					elsif ( @labels){
+					elsif (@labels){
 						$label = get_label($row[0]);
 					}
 				}
-				if ($show{'uuid'}) {
-					if (%part && $part{'uuid'}) {
+				if ($show{'uuid'}){
+					if ($part{'uuid'}){
 						$uuid = $part{'uuid'};
 					}
-					elsif ( @uuids){
+					elsif (@uuids){
 						$uuid = get_uuid($row[0]);
 					}
 				}
 			}
 			else {
 				$fs = ($b_fs) ? $row[1]: get_mounts_fs($row[0],\@mount);
-				if (@gpart && ($show{'label'} || $show{'uuid'} ) ){
-					my @extra = get_bsd_label_uuid("$dev_base");
-					if (@extra){
-						$label = $extra[0];
-						$uuid = $extra[1];
-					}
-				}
 			}
+			# assuming that all null/nullfs are parts of a logical fs
+			$b_logical = 1 if $fs && $fs =~ /^(btrfs|hammer|null|zfs)/; 
 			$id = join(' ', @row[$cols .. $#row]);
 			$size = $row[$cols - $back_size];
 			if ($b_admin && -e "/sys/block/"){
@@ -14174,6 +15255,11 @@ sub partition_data {
 				elsif ($dev_base =~ /^\/\/|:\//){
 					$dev_type = 'remote';
 				}
+				# a slice bsd system, zfs can't be detected this easily
+				elsif ($b_logical && $fs && $fs =~ /^(null(fs)?)$/){
+					$dev_type = 'logical';
+					$dev_base = $row[0] if !$dev_base;
+				}
 				# an error has occurred almost for sure
 				elsif (!$dev_base){
 					$dev_type = 'source';
@@ -14183,8 +15269,15 @@ sub partition_data {
 					$dev_type = 'dev';
 				}
 			}
+			if ($bsd_type && $dev_type eq 'dev' && $row[0] && 
+			 ($b_admin || $show{'label'} || $show{'uuid'})){
+				my %temp = DiskDataBSD::get($row[0]);
+				$block_size = $temp{'logical-block-size'};
+				$label = $temp{'label'};
+				$uuid = $temp{'uuid'};
+			}
 			$used = $row[$cols - $back_used];
-			$percent_used = sprintf("%.1f", ( $used/$size )*100) if ($size && main::is_numeric($size) );
+			$percent_used = sprintf("%.1f", ($used/$size)*100) if ($size && main::is_numeric($size));
 			push(@partitions,{
 			'block-size' => $block_size,
 			'dev-base' => $dev_base,
@@ -14204,32 +15297,30 @@ sub partition_data {
 			});
 		}
 	}
-	@data = swap_data();
-	push(@partitions,@data);
-	# print Data::Dumper::Dumper \@partitions if $test[16];
+	swap_data() if !$loaded{'set-swap'};
+	push(@partitions,@swaps);
+	print Data::Dumper::Dumper \@partitions if $dbg[16];
 	if (!$bsd_type && @lsblk){
 		check_partition_data();# updates @partitions 
 	}
 	main::log_data('dump','@partitions',\@partitions) if $b_log;
-	print Data::Dumper::Dumper \@partitions if $test[16];
+	print Data::Dumper::Dumper \@partitions if $dbg[16];
 	eval $end if $b_log;
 }
-
 sub swap_data {
 	eval $start if $b_log;
-	return @swaps if $b_swaps;
-	$b_swaps = 1;
+	$loaded{'set-swap'} = 1;
 	my (@data,@working);
-	my ($cache_pressure,$dev_base,$dev_mapped,$dev_type,$label,$maj_min,
-	$mount,$path,$pattern1,$pattern2,$percent_used,$priority,$size,
-	$swap_type,$swappiness,$used,$uuid);
+	my ($block_size,$cache_pressure,$dev_base,$dev_mapped,$dev_type,$label,
+	$maj_min,$mount,$path,$pattern1,$pattern2,$percent_used,$priority,
+	$size,$swap_type,$swappiness,$used,$uuid);
 	my ($s,$j,$size_id,$used_id) = (1,0,2,3);
 	if (!$bsd_type){
 		# faster, avoid subshell, same as swapon -s
-		if ( -r '/proc/swaps'){
+		if (-r '/proc/swaps'){
 			@working = main::reader("/proc/swaps");
 		}
-		elsif ( $path = main::check_program('swapon') ){
+		elsif ($path = main::check_program('swapon')){
 			# note: while -s is deprecated, --show --bytes is not supported
 			# on older systems
 			@working = main::grabber("$path -s 2>/dev/null");
@@ -14239,11 +15330,14 @@ sub swap_data {
 			$swappiness = $data[0];
 			$cache_pressure = $data[1];
 		}
+		if (($show{'label'} || $show{'uuid'}) && !$loaded{'label-uuid'}){
+			set_label_uuid();
+		}
 		$pattern1 = 'partition|file|ram';
 		$pattern2 = '[^\s].*[^\s]';
 	}
 	else {
-		if ( $path = main::check_program('swapctl') ){
+		if ($path = main::check_program('swapctl')){
 			# output in in KB blocks
 			@working = main::grabber("$path -l -k 2>/dev/null");
 		}
@@ -14256,9 +15350,9 @@ sub swap_data {
 	# data, it's the same exact output as swapon -s
 	foreach (@working){
 		#next if ! /^\/dev/ || /^\/dev\/(ramzwap|zram)/;
-		next if /^(Device|Filename)/;
-		($dev_base,$dev_mapped,$dev_type,$label,$maj_min,$mount,$priority,
-		$swap_type,$uuid) = ('','','','','','',undef,'partition','');
+		next if /^(Device|Filename|no swap)/;
+		($block_size,$dev_base,$dev_mapped,$dev_type,$label,$maj_min,$mount,$priority,
+		$swap_type,$uuid) = ('','','','','','','',undef,'partition','');
 		@data = split(/\s+/, $_);
 		if (/^\/dev\/(block\/)?(compcache|ramzwap|zram)/i){
 			$swap_type = 'zram';
@@ -14271,20 +15365,23 @@ sub swap_data {
 			$swap_type = 'partition';
 			$dev_base = $data[0];
 			$dev_base =~ s|^/dev/||;
-			if (!$bsd_type && $dev_base =~ /^dm-/ && %dmmapper){
-				$dev_mapped = $dmmapper{$dev_base};
-			}
-			if ($show{'label'} && @labels){
-				$label = get_label($data[0]);
-			}
-			if ($show{'uuid'} && @uuids){
-				$uuid = get_uuid($data[0]);
+			if (!$bsd_type){
+				if ($dev_base =~ /^dm-/ && %dmmapper){
+					$dev_mapped = $dmmapper{$dev_base};
+				}
+				if ($show{'label'} && @labels){
+					$label = get_label($data[0]);
+				}
+				if ($show{'uuid'} && @uuids){
+					$uuid = get_uuid($data[0]);
+				}
 			}
-			if ($bsd_type && @gpart && ($show{'label'} || $show{'uuid'} ) ){
-				my @extra = get_bsd_label_uuid("$dev_base");
-				if (@extra){
-					$label = $extra[0];
-					$uuid = $extra[1];
+			else {
+				if ($show{'label'} || $show{'uuid'}){
+					my %temp = DiskDataBSD::get($data[0]);
+					$block_size = $temp{'logical-block-size'};
+					$label = $temp{'label'};
+					$uuid = $temp{'uuid'};
 				}
 			}
 			$dev_type = 'dev';
@@ -14302,8 +15399,9 @@ sub swap_data {
 		}
 		$size = $data[$size_id];
 		$used = $data[$used_id];
-		$percent_used = sprintf("%.1f", ( $used/$size )*100);
+		$percent_used = sprintf("%.1f", ($used/$size)*100);
 		push(@swaps, {
+		'block-size' => $block_size,
 		'cache-pressure' => $cache_pressure,
 		'dev-base' => $dev_base,
 		'dev-mapped' => $dev_mapped,
@@ -14325,9 +15423,8 @@ sub swap_data {
 		$s++;
 	}
 	main::log_data('dump','@swaps',\@swaps) if $b_log;
-	print Data::Dumper::Dumper \@swaps if $test[15];;
+	print Data::Dumper::Dumper \@swaps if $dbg[15];;
 	eval $end if $b_log;
-	return @swaps;
 }
 sub swap_advanced_data {
 	eval $start if $b_log;
@@ -14347,114 +15444,39 @@ sub swap_advanced_data {
 	eval $end if $b_log;
 	return ($swappiness,$cache_pressure);
 }
-sub get_mounts_fs {
-	eval $start if $b_log;
-	my ($item,$mount) = @_;
-	$item =~ s/map:\/(\S+)/map $1/ if $bsd_type && $bsd_type eq 'darwin';
-	return 'N/A' if ! @$mount;
-	my ($fs) = ('');
-	# linux: /dev/sdb6 on /var/www/m type ext4 (rw,relatime,data=ordered)
-	# /dev/sda3 on /root.dev/ugw type ext3 (rw,relatime,errors=continue,user_xattr,acl,barrier=1,data=journal)
-	# bsd: /dev/ada0s1a on / (ufs, local, soft-updates)
-	foreach (@$mount){
-		if ($bsd_type && $_ =~ /^$item\son.*\(([^,\s\)]+)[,\s]*.*\)/){
-			$fs = $1;
-			last;
-		}
-		elsif (!$bsd_type && $_ =~ /^$item\son.*\stype\s([\S]+)\s\([^\)]+\)/){
-			$fs = $1;
-			last;
-		}
-	}
-	eval $end if $b_log;
-	main::log_data('data',"fs: $fs") if $b_log;
-	return $fs;
-}
-# 1. Name: ada1p1
-#   label: (null)
-#   label: ssd-root
-#   rawuuid: b710678b-f196-11e1-98fd-021fc614aca9
-sub get_bsd_label_uuid {
-	eval $start if $b_log;
-	my ($item) = @_;
-	my (@data,$b_found);
-	foreach (@gpart){
-		my @working = split(/\s*:\s*/, $_);
-		if ($_ =~ /^[0-9]+\.\sName:/ && $working[1] eq $item){
-			$b_found = 1;
-		}
-		elsif ($_ =~ /^[0-9]+\.\sName:/ && $working[1] ne $item){
-			$b_found = 0;
-		}
-		if ($b_found){
-			if ($working[0] eq 'label'){
-				$data[0] = $working[1];
-				$data[0] =~ s/\(|\)//g; # eg: label:(null) - we want to show null
-			}
-			if ($working[0] eq 'rawuuid'){
-				$data[1] = $working[1];
-				$data[0] =~ s/\(|\)//g; 
-			}
-		}
-	}
-	main::log_data('dump','@data',\@data) if $b_log;
-	eval $end if $b_log;
-	return @data;
-}
-sub set_label_uuid {
-	eval $start if $b_log;
-	$b_label_uuid = 1;
-	if ( $show{'unmounted'} || $show{'label'} || $show{'uuid'} ){
-		if (!$bsd_type){
-			if (-d '/dev/disk/by-label'){
-				@labels = main::globber('/dev/disk/by-label/*');
-			}
-			if (-d '/dev/disk/by-uuid'){
-				@uuids = main::globber('/dev/disk/by-uuid/*');
-			}
-		}
-		else {
-			if ( my $path = main::check_program('gpart')){
-				@gpart = main::grabber("$path list 2>/dev/null",'','strip');
-			}
-		}
-	}
-	eval $end if $b_log;
-}
-
 # handle cases of hidden file systems
 sub check_partition_data {
 	eval $start if $b_log;
 	my ($b_found,$dev_mapped,$temp);
-	# NOTE: these filters must match the fs filters in sub partitiion_data!!
-	my $fs_filters = 'aufs|cgmfs|configfs|devfs|devtmpfs|';
-	$fs_filters .= 'fdescfs|linprocfs|procfs|squashfs|swap|';
-	$fs_filters .= 'sysfs|tmpfs|unionfs';
+	my $filters = partition_filters();
 	foreach my $row (@lsblk){
 		$b_found = 0;
 		$dev_mapped = '';
 		if (!$row->{'name'} || !$row->{'mount'} || !$row->{'type'} || 
-		 ($row->{'fs'} && $row->{'fs'} =~ /^($fs_filters)$/) ||
+		 ($row->{'fs'} && $row->{'fs'} =~ /^($filters)$/) ||
 		 ($row->{'type'} =~ /^(disk|loop|rom)$/)){
 			next;
 		}
-		#print "$row->{'name'} $row->{'mount'}\n";
+		# unmap so we can match name to dev-base
+		if (%mapper && $mapper{$row->{'name'}}){
+			$dev_mapped = $row->{'name'};
+			$row->{'name'} = $mapper{$row->{'name'}};
+		}
+		# print "$row->{'name'} $row->{'mount'}\n";
 		foreach my $row2 (@partitions){
-			# print "m:$row->{'mount'} id:$row2->{'id'}\n";
+			# print "1: n:$row->{'name'} m:$row->{'mount'} db:$row2->{'dev-base'} id:$row2->{'id'}\n";
 			next if !$row2->{'id'};
-			if ($row->{'mount'} eq $row2->{'id'}){
+			# note: for swap mount point is [SWAP] in @lsblk, but swap-x in @partitions
+			if ($row->{'mount'} eq $row2->{'id'} || $row->{'name'} eq $row2->{'dev-base'}){
 				$b_found = 1;
-				if (%mapper && $mapper{$row->{'name'}}){
-					$dev_mapped = $row->{'name'};
-					$row->{'name'} = $mapper{$row->{'name'}};
-				}
 				last;
 			}
-			#print "m:$row->{'mount'} id:$row2->{'id'}\n";
+			# print "m:$row->{'mount'} id:$row2->{'id'}\n";
 		}
 		if (!$b_found){
-			#print "found: $row->{'name'} $row->{'mount'}\n";
+			# print "found: n:$row->{'name'} m:$row->{'mount'}\n";
 			$temp = {
+			'block-logical' => $row->{'block-logical'},
 			'dev-base' => $row->{'name'},
 			'dev-mapped' => $dev_mapped,
 			'fs' => $row->{'fs'},
@@ -14475,6 +15497,75 @@ sub check_partition_data {
 	}
 	eval $end if $b_log;
 }
+# NOTE: Was forgetting to update one or the other so put them
+# all here for: subs partitiion_data(), check_partition_data()
+# note: p_d filters 'filesystem', and c_p_d filters against fs
+sub partition_filters {
+	# snap mounts with squashfs; appimage/flatpak mount?
+	# swap is set in swap_data(); cgmfs is in ram, like devfs, sysfs; 
+	# union fs types: aufs, overlayfs, unionfs, mergerfs
+	my $filters = 'aufs|cgroup.*|cgmfs|configfs|debugfs|\/dev|dev|\/dev\/loop[0-9]*|';
+	$filters .= 'devfs|devtmpfs|efivarfs|fdescfs|hugetlbfs|iso9660|kernfs|';
+	$filters .= 'linprocfs|linsysfs|none|overla(id|y)(fs)?|procfs|ptyfs|';
+	$filters .= '/run(\/.*)?|run|securityfs|shm|squashfs|swap|sys|\/sys\/.*|sysfs|';
+	$filters .= 'tmpfs|tracefs|type|udev|unionfs|vartmp';
+	return $filters
+}
+# used to exclude disk used, partition/unmounted/swap label/uuid, unmounted label/uuid
+# see docs/inxi-data.txt PARTITION DATA for more on remote/fuse fs
+sub fs_excludes {
+	my ($source) = @_;
+	# panfs is parallel NAS volume manager, need more data
+	# null is hammer fs slice; nfs/nfs3/nfs4; some can be fuse mounts: fuse.sshfs
+	my $excludes = 'afs|archivemount(fs)?|aufs|avfs|ceph|cifs|gfs\d{0,2}|glusterfs|';
+	$excludes .= 'gmailfs|hdfs|ipfs|iso9660||k(osmos)?fs|.*lafs|mhddfs|mergerfs|';
+	$excludes .= 'moosefs|nfs\d{0,2}|null(fs)?|ocfs\d{0,2}|openafs|orangefs|';
+	$excludes .= 'overla(id|y)(fs)?|panfs|pvfs\d{0,2}|s3fs|sheepdog|squashfs|';
+	$excludes .= 'sshfs|smbfs|unionfs|vmfs';
+	# for non disk used excludes
+	$excludes .= '|ffs|fuse(blk)?' if $source eq 'label-uuid';
+	return $excludes;
+}
+sub get_mounts_fs {
+	eval $start if $b_log;
+	my ($item,$mount) = @_;
+	$item =~ s/map:\/(\S+)/map $1/ if $bsd_type && $bsd_type eq 'darwin';
+	return 'N/A' if ! @$mount;
+	my ($fs) = ('');
+	# linux: /dev/sdb6 on /var/www/m type ext4 (rw,relatime,data=ordered)
+	# /dev/sda3 on /root.dev/ugw type ext3 (rw,relatime,errors=continue,user_xattr,acl,barrier=1,data=journal)
+	# bsd: /dev/ada0s1a on / (ufs, local, soft-updates)
+	# bsd 2: /dev/wd0g on /home type ffs (local, nodev, nosuid)
+	foreach (@$mount){
+		if ($_ =~ /^$item\s+on.*?\s+type\s+([\S]+)\s+\([^\)]+\)/){
+			$fs = $1;
+			last;
+		}
+		elsif ($_ =~ /^$item\s+on.*?\s+\(([^,\s\)]+?)[,\s]*.*\)/){
+			$fs = $1;
+			last;
+		}
+	}
+	eval $end if $b_log;
+	main::log_data('data',"fs: $fs") if $b_log;
+	return $fs;
+}
+sub set_label_uuid {
+	eval $start if $b_log;
+	$loaded{'label-uuid'} = 1;
+	if ($show{'unmounted'} || $show{'label'} || $show{'swap'} || $show{'uuid'}){
+		if (-d '/dev/disk/by-label'){
+			@labels = main::globber('/dev/disk/by-label/*');
+		}
+		if (-d '/dev/disk/by-uuid'){
+			@uuids = main::globber('/dev/disk/by-uuid/*');
+		}
+		main::log_data('dump', '@labels', \@labels) if $b_log;
+		main::log_data('dump', '@uuids', \@uuids) if $b_log;
+	}
+	eval $end if $b_log;
+}
+
 # args: 1: blockdev full path (part only); 2: block id; 3: size (part only)
 sub admin_data {
 	eval $start if $b_log;
@@ -14494,7 +15585,7 @@ sub admin_data {
 		$size_raw = 'N/A';
 	}
 	else {
-		$percent = sprintf("%.2f", ($size/$size_raw ) * 100) if $size && $size_raw;
+		$percent = sprintf("%.2f", ($size/$size_raw) * 100) if $size && $size_raw;
 	}
 	# print "$id size: $size %: $percent p-b: $block_size raw: $size_raw\n";
 	@sizes = ($size_raw,$percent,$block_size); 
@@ -14575,10 +15666,9 @@ sub get_uuid {
 }
 }
 
-## ProcessData 
+## ProcessItem 
 {
-package ProcessData;
-
+package ProcessItem;
 sub get {
 	eval $start if $b_log;
 	my $num = 0;
@@ -14595,7 +15685,7 @@ sub get {
 		my $key = 'Message';
 		push(@rows, ({
 		main::key($num++,0,1,$key) => main::row_defaults('ps-data-null',''),
-		},) );
+		},));
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -14622,8 +15712,8 @@ sub cpu_processes {
 	$j = scalar @rows;
 	# $cpu_mem = ' - Memory: MiB / % used' if $extra > 0;
 	my $throttled = throttled($ps_count,$count,$j);
-	#my $header = "CPU  % used - Command - pid$cpu_mem - top";
-	#my $header = "Top $count by CPU";
+	# my $header = "CPU  % used - Command - pid$cpu_mem - top";
+	# my $header = "Top $count by CPU";
 	my @data = ({
 	main::key($num++,1,1,'CPU top') => "$count$throttled" . ' of ' . scalar @ps_aux,
 	},);
@@ -14634,25 +15724,25 @@ sub cpu_processes {
 		$j = scalar @processes;
 		my @row = split(/\s+/, $_);
 		my @command = process_starter(scalar @row, $row[$ps_cols],$row[$ps_cols + 1]);
-		$cpu = ($ps_cols >= 10 ) ? $row[2] . '%': 'N/A';
+		$cpu = ($ps_cols >= 10) ? $row[2] . '%': 'N/A';
 		@data = ({
 		main::key($num++,1,2,$i++) => '',
 		main::key($num++,0,3,'cpu') => $cpu,
 		main::key($num++,1,3,'command') => $command[0],
 		},);
 		push(@processes,@data);
-		if ($command[1]) {
+		if ($command[1]){
 			$processes[$j]->{main::key($num++,0,4,'started by')} = $command[1];
 		}
 		$pid = (defined $pid_col)? $row[$pid_col] : 'N/A';
 		$processes[$j]->{main::key($num++,0,3,'pid')} = $pid;
 		if ($extra > 0 && $ps_cols >= 10){
-			my $decimals = ($row[5]/1024 > 10 ) ? 1 : 2;
+			my $decimals = ($row[5]/1024 > 10) ? 1 : 2;
 			$mem = (defined $row[5]) ? sprintf("%.${decimals}f", $row[5]/1024) . ' MiB' : 'N/A';
 			$mem .= ' (' . $row[3] . '%)';
 			$processes[$j]->{main::key($num++,0,3,'mem')} = $mem;
 		}
-		#print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
+		# print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
 	}
 	eval $end if $b_log;
 	return @processes;
@@ -14675,13 +15765,13 @@ sub mem_processes {
 		$pid_col = 0 if $ps_cols == 2;
 	}
 	@rows = splice(@rows,0,$count);
-	#print Data::Dumper::Dumper \@rows;
-	@processes = main::get_memory_data_full('process') if !$b_mem;
+	# print Data::Dumper::Dumper \@rows;
+	@processes = main::MemoryData::full('process') if !$loaded{'memory'};
 	$j = scalar @rows;
 	my $throttled = throttled($ps_count,$count,$j);
 	#$cpu_mem = ' - CPU: % used' if $extra > 0;
-	#my $header = "Memory MiB/% used - Command - pid$cpu_mem - top";
-	#my $header = "Top $count by Memory";
+	# my $header = "Memory MiB/% used - Command - pid$cpu_mem - top";
+	# my $header = "Top $count by Memory";
 	@data = ({
 	main::key($num++,1,1,'Memory top') => "$count$throttled" . ' of ' . scalar @ps_aux,
 	},);
@@ -14692,7 +15782,7 @@ sub mem_processes {
 		$j = scalar @processes;
 		my @row = split(/\s+/, $_);
 		if ($ps_cols >= 10){
-			my $decimals = ($row[5]/1024 > 10 ) ? 1 : 2;
+			my $decimals = ($row[5]/1024 > 10) ? 1 : 2;
 			$mem = (main::is_int($row[5])) ? sprintf("%.${decimals}f", $row[5]/1024) . ' MiB' : 'N/A';
 			$mem .= " (" . $row[3] . "%)"; 
 		}
@@ -14706,7 +15796,7 @@ sub mem_processes {
 		main::key($num++,1,3,'command') => $command[0],
 		},);
 		push(@processes,@data);
-		if ($command[1]) {
+		if ($command[1]){
 			$processes[$j]->{main::key($num++,0,4,'started by')} = $command[1];
 		}
 		$pid = (defined $pid_col)? $row[$pid_col] : 'N/A';
@@ -14715,7 +15805,7 @@ sub mem_processes {
 			$cpu = $row[2] . '%';
 			$processes[$j]->{main::key($num++,0,3,'cpu')} = $cpu;
 		}
-		#print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
+		# print Data::Dumper::Dumper \@processes, "i: $i; j: $j ";
 	}
 	eval $end if $b_log;
 	return @processes;
@@ -14750,25 +15840,22 @@ sub throttled {
 }
 }
 
-## RaidData
+## RaidItem
 {
-package RaidData;
-# debugger switches
-my $b_hw = 0;
-my $b_lvm = 0;
-my $b_md = 0;
-my $b_zfs = 0;
+package RaidItem;
 
 sub get {
 	eval $start if $b_log;
 	my (@hardware_raid,@rows,$key1,$val1);
 	my $num = 0;
-	@hardware_raid = hw_data() if $b_hardware_raid || $b_hw;
-	raid_data() if !$b_raid;
-	#print 'get: ', Data::Dumper::Dumper \@lvm_raid;
-	#print 'get: ', Data::Dumper::Dumper \@md_raid;
-	#print 'get: ', Data::Dumper::Dumper \@zfs_raid;
-	if (!@lvm_raid && !@md_raid && !@zfs_raid && !@hardware_raid){
+	@hardware_raid = hw_data() if $use{'hardware-raid'} || $fake{'raid-hw'};
+	raid_data() if !$loaded{'raid'};
+	# print 'get btrfs: ', Data::Dumper::Dumper \@btrfs_raid;
+	# print 'get lvm: ', Data::Dumper::Dumper \@lvm_raid;
+	# print 'get md: ', Data::Dumper::Dumper \@md_raid;
+	# print 'get zfs: ', Data::Dumper::Dumper \@zfs_raid;
+	if (!@btrfs_raid && !@lvm_raid && !@md_raid && !@zfs_raid && !@soft_raid && 
+	 !@hardware_raid){
 		if ($show{'raid-forced'}){
 			$key1 = 'Message';
 			$val1 = main::row_defaults('raid-data');
@@ -14778,12 +15865,18 @@ sub get {
 		if (@hardware_raid){
 			push(@rows,hw_output(\@hardware_raid));
 		}
+		if (@btrfs_raid){
+			push(@rows,btrfs_output());
+		}
 		if (@lvm_raid){
 			push(@rows,lvm_output());
 		}
 		if (@md_raid){
 			push(@rows,md_output());
 		}
+		if (@soft_raid){
+			push(@rows,soft_output());
+		}
 		if (@zfs_raid){
 			push(@rows,zfs_output());
 		}
@@ -14792,7 +15885,6 @@ sub get {
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
 	}
 	eval $end if $b_log;
-	($b_md,$b_zfs) = undef;
 	return @rows;
 }
 sub hw_output {
@@ -14811,31 +15903,49 @@ sub hw_output {
 		$rows[$j]->{main::key($num++,0,2,'vendor')} = $row->{'vendor'} if $row->{'vendor'};
 		$rows[$j]->{main::key($num++,1,2,'driver')} = $driver;
 		if ($extra > 0){
-			my $driver_version = ($row->{'driver-version'}) ?  $row->{'driver-version'}: 'N/A' ;
-			$rows[$j]->{main::key($num++,0,3,'v')} = $driver_version;
+			$row->{'driver-version'} ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,3,'v')} = $row->{'driver-version'};
 			if ($extra > 2){
 				my $port= ($row->{'port'}) ? $row->{'port'}: 'N/A' ;
 				$rows[$j]->{main::key($num++,0,2,'port')} = $port;
 			}
-			my $bus_id = (defined $row->{'bus-id'} && defined $row->{'sub-id'}) ?  "$row->{'bus-id'}.$row->{'sub-id'}": 'N/A' ;
-			$rows[$j]->{main::key($num++,0,2,'bus ID')} = $bus_id;
+			my $bus_id = (defined $row->{'bus-id'} && defined $row->{'sub-id'}) ? "$row->{'bus-id'}.$row->{'sub-id'}": 'N/A' ;
+			$rows[$j]->{main::key($num++,0,2,'bus-ID')} = $bus_id;
 		}
 		if ($extra > 1){
-			my $chip_id = (defined $row->{'vendor-id'} && defined $row->{'chip-id'}) ?  "$row->{'vendor-id'}.$row->{'chip-id'}": 'N/A' ;
-			$rows[$j]->{main::key($num++,0,2,'chip ID')} = $chip_id;
+			my $chip_id = (defined $row->{'vendor-id'} && defined $row->{'chip-id'}) ? "$row->{'vendor-id'}.$row->{'chip-id'}": 'N/A' ;
+			$rows[$j]->{main::key($num++,0,2,'chip-ID')} = $chip_id;
 		}
 		if ($extra > 2){
-			my $rev= (defined $row->{'rev'} && $row->{'rev'}) ? $row->{'rev'}: 'N/A' ;
-			$rows[$j]->{main::key($num++,0,2,'rev')} = $rev;
+			$row->{'rev'} = 'N/A' if !defined $row->{'rev'}; # could be 0
+			$rows[$j]->{main::key($num++,0,2,'rev')} = $row->{'rev'};
+			$rows[$j]->{main::key($num++,0,2,'class-ID')} = $row->{'class-id'} if $row->{'class-id'};
 		}
 	}
 	eval $end if $b_log;
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
+	return @rows;
+}
+sub btrfs_output {
+	eval $start if $b_log;
+	my (@components,@good,@rows);
+	my ($size);
+	my ($j,$num) = (0,0);
+	foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @btrfs_raid){
+		
+		$j = scalar @rows;
+		$rows[$j]->{main::key($num++,1,2,'Components')} = '';
+		my $b_bump;
+		components_output('lvm','Online',\@rows,\@good,\$j,\$num,\$b_bump);
+		components_output('lvm','Meta',\@rows,\@components,\$j,\$num,\$b_bump);
+	}
+	eval $end if $b_log;
+	# print Data::Dumper::Dumper \@rows;
 	return @rows;
 }
 sub lvm_output {
 	eval $start if $b_log;
-	my (@components,@components_good,@components_meta,@rows);
+	my (@components,@good,@components_meta,@rows);
 	my ($size);
 	my ($j,$num) = (0,0);
 	foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @lvm_raid){
@@ -14861,7 +15971,7 @@ sub lvm_output {
 			if (defined $row->{'stripes'}){
 				$rows[$j]->{main::key($num++,0,3,'stripes')} = $row->{'stripes'};
 			}
-			if (defined $row->{'raid-mismatches'} && ($extra > 1 || $row->{'raid-mismatches'} > 0 )){
+			if (defined $row->{'raid-mismatches'} && ($extra > 1 || $row->{'raid-mismatches'} > 0)){
 				$rows[$j]->{main::key($num++,0,3,'mismatches')} = $row->{'raid-mismatches'};
 			}
 			if (defined $row->{'copy-percent'} && ($extra > 1 || $row->{'copy-percent'} < 100)){
@@ -14876,32 +15986,32 @@ sub lvm_output {
 			$rows[$j]->{main::key($num++,0,4,'vg-free')} = $size;
 		}
 		@components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
-		@components_good = ();
+		@good = ();
 		@components_meta = ();
 		foreach my $item (sort { $a->[0] cmp $b->[0]} @components){
 			if ($item->[4] =~ /_rmeta/){
 				push(@components_meta, $item);
 			}
 			else {
-				push(@components_good, $item);
+				push(@good, $item);
 			}
 		}
 		$j = scalar @rows;
 		$rows[$j]->{main::key($num++,1,2,'Components')} = '';
 		my $b_bump;
-		components_output('lvm','Online',\@rows,\@components_good,\$j,\$num,\$b_bump);
+		components_output('lvm','Online',\@rows,\@good,\$j,\$num,\$b_bump);
 		components_output('lvm','Meta',\@rows,\@components_meta,\$j,\$num,\$b_bump);
 	}
 	eval $end if $b_log;
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
 	return @rows;
 }
 sub md_output {
 	eval $start if $b_log;
-	my (@components,@components_good,@failed,@inactive,@rows,@spare,@temp);
+	my (@components,@good,@failed,@inactive,@rows,@spare,@temp);
 	my ($blocks,$chunk,$level,$report,$size,$status);
 	my ($j,$num) = (0,0);
-	#print Data::Dumper::Dumper \@md_raid;
+	# print Data::Dumper::Dumper \@md_raid;
 	if ($extra > 2 && $md_raid[0]->{'supported-levels'}){
 		push(@rows, {
 		main::key($num++,0,1,'Supported mdraid levels') => $md_raid[0]->{'supported-levels'},
@@ -14911,7 +16021,7 @@ sub md_output {
 		$j = scalar @rows;
 		next if !%$row;
 		$num = 1;
-		$level = (defined $row->{'level'}) ? $row->{'level'} : 'no-raid';
+		$level = (defined $row->{'level'}) ? $row->{'level'} : 'linear';
 		push(@rows, {
 		main::key($num++,1,1,'Device') => $row->{'id'},
 		});
@@ -14935,7 +16045,7 @@ sub md_output {
 		$report .= " $row->{'u-data'}" if $report; 
 		$report ||= 'N/A';
 		if ($extra == 0){
-			#print "here 0\n";
+			# print "here 0\n";
 			$rows[$j]->{main::key($num++,0,2,'report')} = $report;
 		}
 		if ($extra > 0){
@@ -14947,13 +16057,13 @@ sub md_output {
 			$blocks = ($row->{'blocks'}) ? $row->{'blocks'} : 'N/A';
 			$rows[$j]->{main::key($num++,0,3,'blocks')} = $blocks;
 			$chunk = ($row->{'chunk-size'}) ? $row->{'chunk-size'} : 'N/A';
-			$rows[$j]->{main::key($num++,0,3,'chunk size')} = $chunk;
+			$rows[$j]->{main::key($num++,0,3,'chunk-size')} = $chunk;
 			if ($extra > 1){
 				if ($row->{'bitmap'}){
 					$rows[$j]->{main::key($num++,0,3,'bitmap')} = $row->{'bitmap'};
 				}
 				if ($row->{'super-block'}){
-					$rows[$j]->{main::key($num++,0,3,'super blocks')} = $row->{'super-block'};
+					$rows[$j]->{main::key($num++,0,3,'super-blocks')} = $row->{'super-block'};
 				}
 				if ($row->{'algorithm'}){
 					$rows[$j]->{main::key($num++,0,3,'algorithm')} = $row->{'algorithm'};
@@ -14961,7 +16071,7 @@ sub md_output {
 			}
 		}
 		@components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
-		@components_good = ();
+		@good = ();
 		@failed = ();
 		@inactive = ();
 		@spare = ();
@@ -14969,22 +16079,22 @@ sub md_output {
 		# print Data::Dumper::Dumper \@components;
 		foreach my $item (sort { $a->[1] <=> $b->[1]} @components){
 			if (defined $item->[2] && $item->[2] =~ /^(F)$/){
-				push(@failed, $item);
+				push(@failed,$item);
 			}
 			elsif (defined $item->[2] && $item->[2] =~ /(S)$/){
-				push(@spare, $item);
+				push(@spare,$item);
 			}
-			elsif ($row->{'status'} && $row->{'status'} eq 'inactive' ){
-				push(@inactive, $item);
+			elsif ($row->{'status'} && $row->{'status'} eq 'inactive'){
+				push(@inactive,$item);
 			}
 			else {
-				push(@components_good, $item);
+				push(@good,$item);
 			}
 		}
 		$j = scalar @rows;
 		$rows[$j]->{main::key($num++,1,2,'Components')} = '';
 		my $b_bump;
-		components_output('mdraid','Online',\@rows,\@components_good,\$j,\$num,\$b_bump);
+		components_output('mdraid','Online',\@rows,\@good,\$j,\$num,\$b_bump);
 		components_output('mdraid','Failed',\@rows,\@failed,\$j,\$num,\$b_bump);
 		components_output('mdraid','Inactive',\@rows,\@inactive,\$j,\$num,\$b_bump);
 		components_output('mdraid','Spare',\@rows,\@spare,\$j,\$num,\$b_bump);
@@ -14997,7 +16107,7 @@ sub md_output {
 			}
 			$rows[$j]->{main::key($num++,1,2,'Recovering')} = $percent;
 			my $finish = ($row->{'recovery-finish'})?$row->{'recovery-finish'} : 'N/A';
-			$rows[$j]->{main::key($num++,0,3,'time remaining')} = $finish;
+			$rows[$j]->{main::key($num++,0,3,'time-remaining')} = $finish;
 			if ($extra > 0){
 				if ($row->{'sectors-recovered'}){
 					$rows[$j]->{main::key($num++,0,3,'sectors')} = $row->{'sectors-recovered'};
@@ -15009,17 +16119,79 @@ sub md_output {
 		}
 	}
 	eval $end if $b_log;
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
+	return @rows;
+}
+
+sub soft_output {
+	eval $start if $b_log;
+	my (@components,@good,@failed,@rows,@offline,@rebuild,@temp);
+	my ($size);
+	my ($j,$num) = (0,0);
+	if (@soft_raid && $alerts{'bioctl'}->{'action'} eq 'permissions'){
+		push(@rows,{
+		main::key($num++,1,1,'Message') => main::row_defaults('root-item-incomplete','softraid'),
+		});
+	}
+	# print Data::Dumper::Dumper \@soft_raid;
+	foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @soft_raid){
+		$j = scalar @rows;
+		next if !%$row;
+		$num = 1;
+		push(@rows, {
+		main::key($num++,1,1,'Device') => $row->{'id'},
+		});
+		$row->{'level'} ||= 'N/A';
+		$rows[$j]->{main::key($num++,0,2,'type')} = $row->{'type'};
+		$rows[$j]->{main::key($num++,0,2,'level')} = $row->{'level'};
+		$rows[$j]->{main::key($num++,0,2,'status')} = $row->{'status'};
+		if ($row->{'state'}){
+			$rows[$j]->{main::key($num++,0,2,'state')} = $row->{'state'};
+		}
+		if ($row->{'size'}){
+			$size = main::get_size($row->{'size'},'string');
+		}
+		$size ||= 'N/A';
+		$rows[$j]->{main::key($num++,0,2,'size')} = $size;
+		@components = (ref $row->{'components'} eq 'ARRAY') ? @{$row->{'components'}} : ();
+		@good = ();
+		@failed = ();
+		@offline = ();
+		@rebuild = ();
+		foreach my $item (sort { $a->[1] <=> $b->[1]} @components){
+			if (defined $item->[2] && $item->[2] eq 'failed'){
+				push(@failed,$item);
+			}
+			elsif (defined $item->[2] && $item->[2] eq 'offline'){
+				push(@offline,$item);
+			}
+			elsif (defined $item->[2] && $item->[2] eq 'rebuild'){
+				push(@rebuild,$item);
+			}
+			else {
+				push(@good,$item);
+			}
+		}
+		$j = scalar @rows;
+		$rows[$j]->{main::key($num++,1,2,'Components')} = '';
+		my $b_bump;
+		components_output('softraid','Online',\@rows,\@good,\$j,\$num,\$b_bump);
+		components_output('softraid','Failed',\@rows,\@failed,\$j,\$num,\$b_bump);
+		components_output('softraid','Rebuild',\@rows,\@rebuild,\$j,\$num,\$b_bump);
+		components_output('softraid','Offline',\@rows,\@offline,\$j,\$num,\$b_bump);
+	}
+	eval $end if $b_log;
+	# print Data::Dumper::Dumper \@rows;
 	return @rows;
 }
 
 sub zfs_output {
-		eval $start if $b_log;
-	my (@arrays,@arrays_holder,@components,@components_good,@failed,@rows,@spare);
+	eval $start if $b_log;
+	my (@arrays,@arrays_holder,@components,@good,@failed,@rows,@spare);
 	my ($allocated,$available,$level,$size,$status);
 	my ($b_row_1_sizes);
 	my ($j,$num) = (0,0);
-	#print Data::Dumper::Dumper \@zfs_raid;
+	# print Data::Dumper::Dumper \@zfs_raid;
 	foreach my $row (sort {$a->{'id'} cmp $b->{'id'}} @zfs_raid){
 		$j = scalar @rows;
 		$b_row_1_sizes = 0;
@@ -15030,70 +16202,80 @@ sub zfs_output {
 		main::key($num++,0,2,'type') => $row->{'type'},
 		main::key($num++,0,2,'status') => $row->{'status'},
 		});
-		$size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : '';
-		$available = main::get_size($row->{'free'},'string',''); # could be zero free
+		$size = ($row->{'raw-size'}) ? main::get_size($row->{'raw-size'},'string') : '';
+		$available = main::get_size($row->{'raw-free'},'string',''); # could be zero free
 		if ($extra > 2){
-			$allocated = ($row->{'allocated'}) ? main::get_size($row->{'allocated'},'string') : '';
+			$allocated = ($row->{'raw-allocated'}) ? main::get_size($row->{'raw-allocated'},'string') : '';
 		}
 		@arrays = @{$row->{'arrays'}};
 		@arrays = grep {defined $_} @arrays;
 		@arrays_holder = @arrays;
 		my $count = scalar @arrays;
-		if (!defined $arrays[0]->{'level'} ){
-			$level = 'no-raid';
+		if (!defined $arrays[0]->{'level'}){
+			$level = 'linear';
 			$rows[$j]->{main::key($num++,0,2,'level')} = $level;
 		}
 		elsif ($count < 2 && $arrays[0]->{'level'}){
 			$rows[$j]->{main::key($num++,0,2,'level')} = $arrays[0]->{'level'};
 		}
-		if ($size){
-			#print "here 0\n";
-			$rows[$j]->{main::key($num++,0,2,'size')} = $size;
-			$size = '';
-			$b_row_1_sizes = 1;
-		}
-		if ($available){
-			$rows[$j]->{main::key($num++,0,2,'free')} = $available;
-			$available = '';
-			$b_row_1_sizes = 1;
+		if ($size || $available || $allocated){
+			$rows[$j]->{main::key($num++,1,2,'raw')} = '';
+			if ($size){
+				# print "here 0\n";
+				$rows[$j]->{main::key($num++,0,3,'size')} = $size;
+				$size = '';
+				$b_row_1_sizes = 1;
+			}
+			if ($available){
+				$rows[$j]->{main::key($num++,0,3,'free')} = $available;
+				$available = '';
+				$b_row_1_sizes = 1;
+			}
+			if ($allocated){
+				$rows[$j]->{main::key($num++,0,3,'allocated')} = $allocated;
+				$allocated = '';
+			}
 		}
-		if ($allocated){
-			$rows[$j]->{main::key($num++,0,2,'allocated')} = $allocated;
-			$allocated = '';
+		if ($row->{'zfs-size'}){
+			$rows[$j]->{main::key($num++,1,2,'zfs-fs')} = '';
+			$rows[$j]->{main::key($num++,0,3,'size')} = main::get_size($row->{'zfs-size'},'string');
+			$rows[$j]->{main::key($num++,0,3,'free')} = main::get_size($row->{'zfs-free'},'string');
 		}
 		foreach my $row2 (@arrays){
 			if ($count > 1){
 				$j = scalar @rows;
 				$num = 1;
-				$size = ($row2->{'size'}) ? main::get_size($row2->{'size'},'string') : 'N/A';
-				$available = ($row2->{'free'}) ? main::get_size($row2->{'free'},'string') : 'N/A';
-				$level = (defined $row2->{'level'}) ? $row2->{'level'}: 'no-raid';
+				$size = ($row2->{'raw-size'}) ? main::get_size($row2->{'raw-size'},'string') : 'N/A';
+				$available = ($row2->{'raw-free'}) ? main::get_size($row2->{'raw-free'},'string') : 'N/A';
+				$level = (defined $row2->{'level'}) ? $row2->{'level'}: 'linear';
 				$status = ($row2->{'status'}) ? $row2->{'status'}: 'N/A';
 				push(@rows, {
 				main::key($num++,1,2,'Array') => $level,
 				main::key($num++,0,3,'status') => $status,
-				main::key($num++,0,3,'size') => $size,
-				main::key($num++,0,3,'free') => $available,
+				main::key($num++,1,3,'raw') => '',
+				main::key($num++,0,4,'size') => $size,
+				main::key($num++,0,4,'free') => $available,
 				});
 			}
 			# items like cache may have one component, with a size on that component
 			elsif (!$b_row_1_sizes){
-				#print "here $count\n";
-				$size = ($row2->{'size'}) ? main::get_size($row2->{'size'},'string') : 'N/A';
-				$available = ($row2->{'free'}) ? main::get_size($row2->{'free'},'string') : 'N/A';
-				$rows[$j]->{main::key($num++,0,2,'size')} = $size;
-				$rows[$j]->{main::key($num++,0,2,'free')} = $available;
+				# print "here $count\n";
+				$size = ($row2->{'raw-size'}) ? main::get_size($row2->{'raw-size'},'string') : 'N/A';
+				$available = ($row2->{'raw-free'}) ? main::get_size($row2->{'raw-free'},'string') : 'N/A';
+				$rows[$j]->{main::key($num++,1,2,'raw')} = '';
+				$rows[$j]->{main::key($num++,0,3,'size')} = $size;
+				$rows[$j]->{main::key($num++,0,3,'free')} = $available;
 				if ($extra > 2){
-					$allocated = ($row->{'allocated'}) ? main::get_size($row2->{'allocated'},'string') : '';
+					$allocated = ($row->{'raw-allocated'}) ? main::get_size($row2->{'allocated'},'string') : '';
 					if ($allocated){
-						$rows[$j]->{main::key($num++,0,2,'allocated')} = $allocated;
+						$rows[$j]->{main::key($num++,0,3,'allocated')} = $allocated;
 					}
 				}
 			}
 			@components = (ref $row2->{'components'} eq 'ARRAY') ? @{$row2->{'components'}} : ();
 			@failed = ();
 			@spare = ();
-			@components_good = ();
+			@good = ();
 			# @spare = split(/\s+/, $row->{'unused'}) if $row->{'unused'};
 			foreach my $item (sort { $a->[0] cmp $b->[0]} @components){
 				if (defined $item->[3] && $item->[3] =~ /^(DEGRADED|FAULTED|UNAVAIL)$/){
@@ -15105,19 +16287,19 @@ sub zfs_output {
 				# note: spares in use show: INUSE but technically it's still a spare,
 				# but since it's in use, consider it online.
 				else {
-					push(@components_good, $item);
+					push(@good, $item);
 				}
 			}
 			$j = scalar @rows;
 			$rows[$j]->{main::key($num++,1,3,'Components')} = '';
 			my $b_bump;
-			components_output('zfs','Online',\@rows,\@components_good,\$j,\$num,\$b_bump);
+			components_output('zfs','Online',\@rows,\@good,\$j,\$num,\$b_bump);
 			components_output('zfs','Failed',\@rows,\@failed,\$j,\$num,\$b_bump);
 			components_output('zfs','Available',\@rows,\@spare,\$j,\$num,\$b_bump);
 		}
 	}
 	eval $end if $b_log;
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
 	return @rows;
 }
 
@@ -15127,7 +16309,10 @@ sub components_output {
 	my ($type,$item,$rows_ref,$array_ref,$j_ref,$num_ref,$b_bump_ref) = @_;
 	return if !@$array_ref && $item ne 'Online';
 	my ($extra1,$extra2,$f1,$f2,$f3,$f4,$f5,$k,$k1,$key1,$l1,$l2,$l3);
-	if ($type eq 'lvm'){
+	if ($type eq 'btrfs'){
+	
+	}
+	elsif ($type eq 'lvm'){
 		($f1,$f2,$f3,$f4,$f5,$l1,$l2,$l3) = (1,2,3,4,5,3,4,5);
 		$k = 1;
 		$extra1 = 'mapped';
@@ -15138,20 +16323,25 @@ sub components_output {
 		$extra1 = 'mapped';
 		$k = 1 if $item eq 'Inactive';
 	}
+	elsif ($type eq 'softraid'){
+		($f1,$f2,$f3,$f4,$k1,$l1,$l2,$l3) = (1,10,10,3,5,3,4,5);
+		$extra1 = 'device';
+		$k = 1;
+	}
 	elsif ($type eq 'zfs'){
 		($f1,$f2,$f3,$l1,$l2,$l3) = (1,2,3,4,5,6);
 		$k = 1;
 	}
-	#print "item: $item\n";
+	# print "item: $item\n";
 	$$j_ref++ if $$b_bump_ref;
 	$$b_bump_ref = 0;
-	my $good = ($item eq 'Online' && !@$array_ref ) ? 'N/A' : '';
+	my $good = ($item eq 'Online' && !@$array_ref) ? 'N/A' : '';
 	$$rows_ref[$$j_ref]->{main::key($$num_ref++,1,$l1,$item)} = $good;
 	#$$j_ref++ if $b_admin; 
-	#print Data::Dumper::Dumper $array_ref;
+	# print Data::Dumper::Dumper $array_ref;
 	foreach my $device (@$array_ref){
 		next if ref $device ne 'ARRAY';
-		#if ($b_admin && $device->[$f1] && $device->[$f2]){
+		# if ($b_admin && $device->[$f1] && $device->[$f2]){
 		if ($b_admin){
 			$$j_ref++;
 			$$b_bump_ref = 1;
@@ -15163,7 +16353,7 @@ sub components_output {
 			$$rows_ref[$$j_ref]{main::key($$num_ref++,0,$l3,'maj-min')} = $device->[$f2];
 		}
 		if ($b_admin && $device->[$f1]){
-			my $size = ($device->[$f1]) ? main::get_size($device->[$f1],'string') : 'N/A';
+			my $size = main::get_size($device->[$f1],'string');
 			$$rows_ref[$$j_ref]->{main::key($$num_ref++,0,$l3,'size')} = $size;
 		}
 		if ($b_admin && $device->[$f3]){
@@ -15181,19 +16371,28 @@ sub components_output {
 
 sub raid_data {
 	eval $start if $b_log;
-	main::set_lsblk() if !$bsd_type && !$b_lsblk;
-	main::set_mapper() if !$bsd_type && !$b_mapper;
-	main::set_proc_partitions() if !$bsd_type && !$b_proc_partitions;
+	LsblkData::set() if !$bsd_type && !$loaded{'lsblk'};
+	main::set_mapper() if !$bsd_type && !$loaded{'mapper'};
+	PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
 	my (@data);
-	$b_raid = 1;
-	if (($b_fake_raid && $b_lvm) || 
-	    ($alerts{'lvs'}->{'action'} && $alerts{'lvs'}->{'action'} eq 'use')){
+	$loaded{'raid'} = 1;
+	if ($fake{'raid-btrfs'} || 
+	 ($alerts{'btrfs'}->{'action'} && $alerts{'btrfs'}->{'action'} eq 'use')){
+		@btrfs_raid = btrfs_data();
+	}
+	if ($fake{'raid-lvm'} || 
+	 ($alerts{'lvs'}->{'action'} && $alerts{'lvs'}->{'action'} eq 'use')){
 		@lvm_raid = lvm_data();
 	}
-	if (($b_fake_raid && $b_md) || (my $file = main::system_files('mdstat') )){
+	if ($fake{'raid-md'} || (my $file = $system_files{'proc-mdstat'})){
 		@md_raid = md_data($file);
 	}
-	if (($b_fake_raid && $b_zfs) || (my $path = main::check_program('zpool') )){
+	if ($fake{'raid-soft'} || $sysctl{'softraid'}){
+		DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+		@soft_raid = soft_data();
+	}
+	if ($fake{'raid-zfs'} || (my $path = main::check_program('zpool'))){
+		DiskDataBSD::set() if $bsd_type && !$loaded{'disk-data-bsd'};
 		@zfs_raid = zfs_data($path);
 	}
 	eval $end if $b_log;
@@ -15211,15 +16410,17 @@ sub raid_data {
 # 10 modules
 sub hw_data {
 	eval $start if $b_log;
+	return if !$devices{'hwraid'};
 	my ($driver,$vendor,@hardware_raid);
-	foreach my $working (@devices_hwraid){
+	foreach my $working (@{$devices{'hwraid'}}){
 		$driver = ($working->[9]) ? lc($working->[9]): '';
 		$driver =~ s/-/_/g if $driver;
 		my $driver_version = ($driver) ? main::get_module_version($driver): '';
-		if ($extra > 2 && $b_pci_tool && $working->[11]){
+		if ($extra > 2 && $use{'pci-tool'} && $working->[11]){
 			$vendor = main::get_pci_vendor($working->[4],$working->[11]);
 		}
 		push(@hardware_raid, {
+		'class-id' => $working->[1],
 		'bus-id' => $working->[2],
 		'chip-id' => $working->[6],
 		'device' => $working->[4],
@@ -15237,15 +16438,31 @@ sub hw_data {
 	eval $end if $b_log;
 	return @hardware_raid;
 }
+sub btrfs_data {
+	eval $start if $b_log;
+	my (@btraid,@working);
+	if ($fake{'raid-btrfs'}){
+	
+	}
+	else {
+	
+	}
+	print Data::Dumper::Dumper \@working if $dbg[37];
+	
+	print Data::Dumper::Dumper \@btraid if $dbg[37];
+	main::log_data('dump','@lvraid',\@btraid) if $b_log;
+	eval $end if $b_log;
+	return @btraid;
+}
 sub lvm_data {
 	eval $start if $b_log;
-	LogicalData::lvm_data() if !$b_lvm_data;
+	LogicalItem::lvm_data() if !$loaded{'logical-data'};
 	return if !@lvm;
 	my (@lvraid,$maj_min,$vg_used,@working);
 	foreach my $item (@lvm){
-		next if $item->{'segtype'} !~ /^raid/;
+		next if $item->{'segtype'} && $item->{'segtype'} !~ /^raid/;
 		my (@components,$dev,$maj_min,$vg_used);
-		#print Data::Dumper::Dumper $item;
+		# print Data::Dumper::Dumper $item;
 		if ($item->{'lv_kernel_major'} . ':' . $item->{'lv_kernel_minor'}){
 			$maj_min = $item->{'lv_kernel_major'} . ':' . $item->{'lv_kernel_minor'};
 		}
@@ -15258,7 +16475,7 @@ sub lvm_data {
 		foreach my $part (@working){
 			my (@data,$dev,$maj_min,$mapped,$size);
 			if (@proc_partitions){
-				@data = main::get_proc_partition($part);
+				@data = PartitionData::get($part);
 				$maj_min = $data[0] . ':' . $data[1] if defined $data[1];
 				$size = $data[2];
 				$raw_logical[1] += $size if $part =~ /^dm-/ && $size;
@@ -15290,8 +16507,7 @@ sub lvm_data {
 		'vg-used' => $vg_used,
 		});
 	}
-	
-	# print Data::Dumper::Dumper \@lvraid;
+	print Data::Dumper::Dumper \@lvraid if $dbg[37];
 	main::log_data('dump','@lvraid',\@lvraid) if $b_log;
 	eval $end if $b_log;
 	return @lvraid;
@@ -15300,7 +16516,7 @@ sub md_data {
 	eval $start if $b_log;
 	my ($mdstat) = @_;
 	my $j = 0;
-	if ($b_fake_raid) {
+	if ($fake{'raid-md'}){
 		#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-4-device-1.txt";
 		#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-rebuild-1.txt";
 		#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-2-mirror-fserver2-1.txt";
@@ -15311,16 +16527,16 @@ sub md_data {
 		#$mdstat = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/md-inactive-active-spare-syntax.txt";
 	}
 	my @working = main::reader($mdstat,'strip');
-	#print Data::Dumper::Dumper \@working;
+	# print Data::Dumper::Dumper \@working;
 	my (@mdraid,@temp,$b_found,$system,$unused);
 	# NOTE: a system with empty mdstat will not show these values
 	if ($working[0] && $working[0] =~ /^Personalities/){
-		$system = ( split(/:\s*/, $working[0]))[1];
+		$system = (split(/:\s*/, $working[0]))[1];
 		$system =~ s/\[|\]//g if $system;
 		shift @working;
 	}
 	if ($working[-1] && $working[-1] =~ /^unused\sdevices/){
-		$unused = ( split(/:\s*/, $working[-1]))[1];
+		$unused = (split(/:\s*/, $working[-1]))[1];
 		$unused =~ s/<|>|none//g if $unused;
 		pop @working;
 	}
@@ -15351,14 +16567,14 @@ sub md_data {
 			@temp = ();
 			# cascade of tests, light to cpu intense
 			if ((!$maj_min || !$size) && @proc_partitions){
-				@part = main::get_proc_partition($id);
+				@part = PartitionData::get($id);
 				if (@part){
 					$maj_min = $part[0] . ':' . $part[1];
 					$size = $part[2];
 				}
 			}
 			if ((!$maj_min || !$size) && @lsblk){
-				%device = main::get_lsblk($id) if @lsblk;
+				%device = LsblkData::get($id) if @lsblk;
 				$maj_min = $device{'maj-min'} if $device{'maj-min'};
 				$size = $device{'size'} if $device{'size'};
 			}
@@ -15382,14 +16598,14 @@ sub md_data {
 					$state = $details{'devices'}->{$name}{'state'};
 				}
 				if ((!$maj_min || !$part_size) && @proc_partitions){
-					@part = main::get_proc_partition($name);
+					@part = PartitionData::get($name);
 					if (@part){
 						$maj_min = $part[0] . ':' . $part[1] if !$maj_min;
 						$part_size = $part[2] if !$part_size;
 					}
 				}
-				if ((!$maj_min || !$part_size) && @lsblk) {
-					%data= main::get_lsblk($name);
+				if ((!$maj_min || !$part_size) && @lsblk){
+					%data= LsblkData::get($name);
 					$maj_min = $data{'maj-min'} if !$maj_min;
 					$part_size = $data{'size'}if !$part_size;
 				}
@@ -15398,7 +16614,7 @@ sub md_data {
 				$state = $info if !$state && $info;
 				push(@components,[$name,$number,$info,$part_size,$maj_min,$state,$mapped]);
 			}
-			#print "$component_string\n";
+			# print "$component_string\n";
 			$j = scalar @mdraid;
 			push(@mdraid, {
 			'chunk-size' => $details{'chunk-size'}, # if we got it, great, if not, further down
@@ -15412,7 +16628,7 @@ sub md_data {
 			'type' => 'mdraid',
 			});
 		}
-		#print "$_\n";
+		# print "$_\n";
 		if ($_ =~ /^([0-9]+)\sblocks/){
 			$mdraid[$j]->{'blocks'} = $1;
 		}
@@ -15441,13 +16657,13 @@ sub md_data {
 			$mdraid[$j]->{'recovery-finish'} = $1;
 			$mdraid[$j]->{'recovery-speed'} = $2;
 		}
-		#print 'mdraid loop: ', Data::Dumper::Dumper \@mdraid;
+		# print 'mdraid loop: ', Data::Dumper::Dumper \@mdraid;
 	}
 	if (@mdraid){
 		$mdraid[0]->{'supported-levels'} = $system if $system;
 		$mdraid[0]->{'unused'} = $unused if $unused;
 	}
-	#print Data::Dumper::Dumper \@mdraid;
+	print Data::Dumper::Dumper \@mdraid if $dbg[37];
 	eval $end if $b_log;
 	return @mdraid;
 }
@@ -15458,7 +16674,7 @@ sub md_details {
 	my $cmd = $alerts{'mdadm'}->{'path'} . " --detail /dev/$id 2>/dev/null";
 	my @data = main::grabber($cmd,'','strip');
 	main::log_data('dump',"$id raw: \@data",\@data) if $b_log;
-	foreach (@data) {
+	foreach (@data){
 		@working = split(/\s*:\s*/, $_, 2);
 		if (scalar @working == 2){
 			if ($working[0] eq 'Array Size' && $working[1] =~ /^([0-9]+)\s\(/){
@@ -15510,38 +16726,104 @@ sub md_details {
 			};
 		}
 	}
-	#print Data::Dumper::Dumper \%details;
+	# print Data::Dumper::Dumper \%details;
 	main::log_data('dump',"$id: %details",\%details) if $b_log;
 	eval $end if $b_log;
 	return %details;
 }
 
+sub soft_data {
+	eval $start if $b_log;
+	my ($cmd,$id,$state,$status,@data,@softraid,@working);
+	# already been set in DiskDataBSD but we know the device exists
+	foreach my $device (@{$sysctl{'softraid'}}){
+		if ($device =~ /\.drive[\d]+:([\S]+)\s\(([a-z0-9]+)\)[,\s]+(\S+)/){
+			my ($level,$size,@components);
+			$id = $2;
+			$status = $1;
+			$state = $3;
+			if ($alerts{'bioctl'}->{'action'} eq 'use'){
+				$cmd = $alerts{'bioctl'}->{'path'} . " $id 2>/dev/null";
+				@data = main::grabber($cmd,'','strip');
+				main::log_data('dump','softraid @data',\@data) if $b_log;
+				shift @data if @data; # get rid of headers 
+				foreach my $row (@data){
+					@working = split(/\s+/,$row);
+					next if !defined $working[0];
+					if ($working[0] =~ /^softraid/){
+						if ($working[3] && main::is_numeric($working[3])){
+							$size = $working[3]/1024;# it's in bytes
+							$raw_logical[0] += $size;
+						}
+						$status = lc($working[2]) if $working[2];
+						$state = lc(join(' ', @working[6..$#working])) if $working[6];
+						$level = lc($working[5]) if $working[5];
+					}
+					elsif ($working[0] =~ /^[\d]{1,2}$/){
+						my ($c_id,$c_device,$c_size,$c_status);
+						if ($working[2] && main::is_numeric($working[2])){
+							$c_size = $working[2]/1024;# it's in bytes
+							$raw_logical[1] += $c_size;
+						}
+						$c_status = lc($working[1]) if $working[1];
+						if ($working[3] && $working[3] =~ /^([\d:\.]+)$/){
+							$c_device = $1;
+						}
+						if ($working[5] && $working[5] =~ /<([^>]+)>/){
+							$c_id = $1;
+						}
+						# when offline, there will be no $c_id, but we want to show device
+						if (!$c_id && $c_device){
+							$c_id = $c_device;
+						}
+						push(@components,[$c_id,$c_size,$c_status,$c_device]) if $c_id;
+					}
+				}
+			}
+			push(@softraid, {
+			'components' => \@components,
+			'id' => $id,
+			'level' => $level,
+			'size' => $size,
+			'state' => $state,
+			'status' => $status,
+			'type' => 'softraid',
+			});
+		}
+	}
+	print Data::Dumper::Dumper \@softraid if $dbg[37];
+	main::log_data('dump','@softraid',\@softraid) if $b_log;
+	eval $end if $b_log;
+	return @softraid;
+}
+
 sub zfs_data {
 	eval $start if $b_log;
 	my ($zpool) = @_;
 	my (@components,@zfs);
-	my ($allocated,$free,$size,$size_holder,$size_logical,$status,@working);
+	my ($allocated,$free,$size,$size_holder,$status,$zfs_used,$zfs_avail,
+	$zfs_size,@working);
 	my $b_v = 1;
 	my ($i,$j,$k) = (0,0,0);
-	if ($b_fake_raid){
-		#my $file;
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-1-mirror-main-solestar.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-2-mirror-main-solestar.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-tank-1.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-gojev-1.txt";
+	if ($fake{'raid-zfs'}){
+		# my $file;
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-1-mirror-main-solestar.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-2-mirror-main-solestar.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-tank-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-list-v-gojev-1.txt";
 		#@working = main::reader($file);$zpool = '';
 	}
 	else {
 		@working = main::grabber("$zpool list -v 2>/dev/null");
 	}
-	DiskData::set_glabel() if $bsd_type && !$b_glabel;
 	# bsd sed does not support inserting a true \n so use this trick
 	# some zfs does not have -v
 	if (!@working){
 		@working = main::grabber("$zpool list 2>/dev/null");
 		$b_v = 0;
 	}
-	#print Data::Dumper::Dumper \@working;
+	my $zfs_path = main::check_program('zfs');
+	# print Data::Dumper::Dumper \@working;
 	main::log_data('dump','@working',\@working) if $b_log;
 	if (!@working){
 		main::log_data('data','no zpool list data') if $b_log;
@@ -15562,36 +16844,50 @@ sub zfs_data {
 		if (/^[\S]+/){
 			@components = ();
 			$i = 0;
-			$raw_logical[0] += $size_holder if $size_holder;
-			$size_holder = $size = ($row[1] && $row[1] ne '-')? main::translate_size($row[1]): '';
+			$size = ($row[1] && $row[1] ne '-') ? main::translate_size($row[1]): '';
 			$allocated = ($row[2] && $row[2] ne '-')? main::translate_size($row[2]): '';
 			$free = ($row[3] && $row[3] ne '-')? main::translate_size($row[3]): '';
+			($zfs_used,$zfs_avail) = zfs_fs_sizes($zfs_path,$row[0]) if $zfs_path;
+			if (defined $zfs_used && defined $zfs_avail){
+				$zfs_size = $zfs_used + $zfs_avail;
+				$raw_logical[0] += $zfs_size; 
+			}
+			else {
+				# must be BEFORE '$size_holder =' because only used if hits a new device
+				# AND unassigned via raid/mirror arrays. Corner case for > 1 device systems. 
+				$raw_logical[0] += $size_holder if $size_holder; 
+				$size_holder = $size;
+			}
 			$status = (defined $row[$status_i] && $row[$status_i] ne '') ? $row[$status_i]: 'no-status';
 			$j = scalar @zfs;
 			push(@zfs, {
 			'id' => $row[0],
-			'allocated' => $allocated,
 			'arrays' => ([],),
-			'free' => $free,
-			'size' => $size,
+			'raw-allocated' => $allocated,
+			'raw-free' => $free,
+			'raw-size' => $size,
+			'zfs-free' => $zfs_avail,
+			'zfs-size' => $zfs_size,
 			'status' => $status,
 			'type' => 'zfs',
 			});
 		}
-		#print Data::Dumper::Dumper \@zfs;
+		# print Data::Dumper::Dumper \@zfs;
 		# raid level is the second item in the output, unless it is not, sometimes it is absent
-		if ($row[1] =~ /raid|mirror/){
+		elsif ($row[1] =~ /raid|mirror/){
 			$row[1] =~ s/^raid1/mirror/;
 			#$row[1] =~ s/^raid/raid-/; # need to match in zpool status <device>
 			$k = scalar @{$zfs[$j]->{'arrays'}};
 			$zfs[$j]->{'arrays'}[$k]{'level'} = $row[1];
 			$i = 0;
-			$size_logical = $size = ($row[2] && $row[2] ne '-') ? main::translate_size($row[2]) : '';
-			$size_holder = 0;
-			$raw_logical[0] += $size if $size;
-			$zfs[$j]->{'arrays'}[$k]{'size'} = $size;
-			$zfs[$j]->{'arrays'}[$k]{'allocated'} = ($row[3] && $row[3] ne '-') ? main::translate_size($row[3]) : '';
-			$zfs[$j]->{'arrays'}[$k]{'free'} = ($row[4] && $row[4] ne '-') ? main::translate_size($row[4]) : '';
+			$size = ($row[2] && $row[2] ne '-') ? main::translate_size($row[2]) : '';
+			if (!defined $zfs_used || !defined $zfs_avail){
+				$size_holder = 0;
+				$raw_logical[0] += $size if $size;
+			}
+			$zfs[$j]->{'arrays'}[$k]{'raw-allocated'} = ($row[3] && $row[3] ne '-') ? main::translate_size($row[3]) : '';
+			$zfs[$j]->{'arrays'}[$k]{'raw-free'} = ($row[4] && $row[4] ne '-') ? main::translate_size($row[4]) : '';
+			$zfs[$j]->{'arrays'}[$k]{'raw-size'} = $size;
 		}
 		# https://blogs.oracle.com/eschrock/entry/zfs_hot_spares
 		elsif ($row[1] =~ /spares/){
@@ -15602,45 +16898,63 @@ sub zfs_data {
 		# this second is a single device not in an array
 		#  ada0s2    25.9G  14.6G  11.3G         -     0%    56%
 		#    gptid/3838f796-5c46-11e6-a931-d05099ac4dc2      -      -      -         -      -      -
-		elsif ($row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*)$/ && 
-		       ($row[2] eq '-' || $row[2] =~ /^[0-9\.]+[MGTP]$/ )){
-			$row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*)\s*(DEGRADED|FAULTED|OFFLINE)?$/;
+		# third is using /dev/disk/by-id 
+		#     ata-VBOX_HARDDISK_VB5b6350cd-06618d58      -      -      -        -         -      -      -      -  ONLINE
+		elsif ($row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*|(ata|mmc|nvme|pci|scsi|wwn)-\S+)$/ && 
+		 ($row[2] eq '-' || $row[2] =~ /^[0-9\.]+[MGTPE]$/)){
+			#print "r1:$row[1]",' :: ', Cwd::abs_path('/dev/disk/by-id/'.$row[1]), "\n";
+			$row[1] =~ /^(sd[a-z]+|[a-z0-9]+[0-9]+|([\S]+)\/.*|(ata|mmc|nvme|pci|scsi|wwn)-\S+)\s.*?(DEGRADED|FAULTED|OFFLINE)?$/;
+			#my $working = '';
 			my $working = ($1) ? $1 : ''; # note: the negative case can never happen
-			my $state = ($3) ? $3 : '';
-			my ($maj_min,$part_size);
-			if ($working =~ /[\S]+\// && @glabel){
-				$working = DiskData::match_glabel($working);
+			my $state = ($4) ? $4 : '';
+			my ($maj_min,$real,$part_size);
+			if ($bsd_type && $working =~ /[\S]+\//){
+				$working = GlabelData::get($working);
+			}
+			elsif (!$bsd_type && $row[1] =~ /^(ata|mmc|nvme|scsi|wwn)-/ && 
+			 -e "/dev/disk/by-id/$row[1]" && ($real = Cwd::abs_path('/dev/disk/by-id/'.$row[1]))){
+				$real =~ s|/dev/||;
+				$working = $real;
+			}
+			elsif (!$bsd_type && $row[1] =~ /^(pci)-/ && 
+			 -e "/dev/disk/by-path/$row[1]" && ($real = Cwd::abs_path('/dev/disk/by-path/'.$row[1]))){
+				$real =~ s|/dev/||;
+				$working = $real;
 			}
 			# kind of a hack, things like cache may not show size/free
 			# data since they have no array row, but they might show it in 
 			# component row:
 			#   ada0s2    25.9G  19.6G  6.25G         -     0%    75%
-			if (!$zfs[$j]->{'size'} && $row[2] && $row[2] ne '-') {
-				$size_logical = $size = ($row[2])? main::translate_size($row[2]): '';
+			if (!$zfs[$j]->{'size'} && $row[2] && $row[2] ne '-'){
+				$size = ($row[2])? main::translate_size($row[2]): '';
 				$size_holder = 0;
 				$zfs[$j]->{'arrays'}[$k]{'size'} = $size;
 				$raw_logical[0] += $size if $size;
 			}
-			if (!$zfs[$j]->{'allocated'} && $row[3] && $row[3] ne '-') {
+			if (!$zfs[$j]->{'allocated'} && $row[3] && $row[3] ne '-'){
 				$allocated = ($row[3])? main::translate_size($row[3]): '';
 				$zfs[$j]->{'arrays'}[$k]{'allocated'} = $allocated;
 			}
-			if (!$zfs[$j]->{'free'} && $row[4] && $row[4] ne '-') {
+			if (!$zfs[$j]->{'free'} && $row[4] && $row[4] ne '-'){
 				$free = ($row[4])? main::translate_size($row[4]): '';
 				$zfs[$j]->{'arrays'}[$k]{'free'} = $free;
 			}
-			if ((!$maj_min || !$part_size) && @lsblk){
-				my @part = main::get_proc_partition($working);
+			if ((!$maj_min || !$part_size) && @proc_partitions){
+				my @part = PartitionData::get($working);
 				if (@part){
 					$maj_min = $part[0] . ':' . $part[1];
 					$part_size = $part[2];
 				}
 			}
 			if ((!$maj_min || !$part_size) && @lsblk){
-				my %data= main::get_lsblk($working);
+				my %data= LsblkData::get($working);
 				$maj_min = $data{'maj-min'};
 				$part_size = $data{'size'};
 			}
+			if (!$part_size && $bsd_type){
+				my %temp = DiskDataBSD::get($working);
+				$part_size = $temp{'size'} if $temp{'size'};
+			}
 			$raw_logical[1] += $part_size if $part_size;
 			$zfs[$j]->{'arrays'}[$k]{'components'}[$i] = [$working,$part_size,$maj_min,$state];
 			$i++;
@@ -15651,16 +16965,28 @@ sub zfs_data {
 	# clear out undefined arrrays values
 	$j = 0;
 	foreach my $row (@zfs){
-		my @arrays = (ref $row->{'arrays'} eq 'ARRAY' ) ? @{$row->{'arrays'}} : ();
+		my @arrays = (ref $row->{'arrays'} eq 'ARRAY') ? @{$row->{'arrays'}} : ();
 		@arrays = grep {defined $_} @arrays;
 		$zfs[$j]->{'arrays'} = \@arrays;
 		$j++;
 	}
 	@zfs = zfs_status($zpool,\@zfs);
-	# print Data::Dumper::Dumper \@zfs;
+	print Data::Dumper::Dumper \@zfs if $dbg[37];
 	eval $end if $b_log;
 	return @zfs;
 }
+sub zfs_fs_sizes {
+	my ($path,$id) = @_;
+	eval $start if $b_log;
+	my @result = main::grabber("$path list -pH $id 2>/dev/null",'','strip');
+	main::log_data('dump','zfs list @result',\@result) if $b_log;
+	print Data::Dumper::Dumper \@result if $dbg[37];
+	my @working = split(/\s+/,$result[0]);
+	eval $end if $b_log;
+	$working[1] = $working[1]/1024 if $working[1];
+	$working[2] = $working[2]/1024 if $working[2];
+	return ($working[1],$working[2]);
+}
 sub zfs_status {
 	eval $start if $b_log;
 	my ($zpool,$zfs) = @_;
@@ -15669,11 +16995,11 @@ sub zfs_status {
 	foreach my $row (@$zfs){
 		$i = 0;
 		$k = 0;
-		if ($b_fake_raid){
+		if ($fake{'raid-zfs'}){
 			my $file;
-			#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-1-mirror-main-solestar.txt";
-			#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-2-mirror-main-solestar.txt";
-			#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-tank-1.txt";
+			# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-1-mirror-main-solestar.txt";
+			# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-2-mirror-main-solestar.txt";
+			# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/raid/zpool-status-tank-1.txt";
 			#@pool_status = main::reader($file,'strip');
 		}
 		else {
@@ -15681,15 +17007,15 @@ sub zfs_status {
 			@pool_status = main::grabber($cmd,"\n",'strip');
 		}
 		main::log_data('cmd',$cmd) if $b_log;
-		#@arrays = (ref $row->{'arrays'} eq 'ARRAY' ) ? @{$row->{'arrays'}} : ();
-		#print "$row->{'id'} rs:$row->{'status'}\n";
+		# @arrays = (ref $row->{'arrays'} eq 'ARRAY') ? @{$row->{'arrays'}} : ();
+		# print "$row->{'id'} rs:$row->{'status'}\n";
 		$status = ($row->{'status'} && $row->{'status'} eq 'no-status') ? check_zfs_status($row->{'id'},\@pool_status): $row->{'status'};
 		$zfs->[$j]{'status'} = $status if $status;
 		#@arrays = grep {defined $_} @arrays;
-		#print "$row->{id} $#arrays\n";
-		#print Data::Dumper::Dumper \@arrays;
+		# print "$row->{id} $#arrays\n";
+		# print Data::Dumper::Dumper \@arrays;
 		foreach my $array (@{$row->{'arrays'}}){
-			#print 'ref: ', ref $array, "\n";
+			# print 'ref: ', ref $array, "\n";
 			#next if ref $array ne 'HASH';
 			my @components = (ref $array->{'components'} eq 'ARRAY') ? @{$array->{'components'}} : ();
 			$l = 0;
@@ -15697,7 +17023,7 @@ sub zfs_status {
 			$level = ($array->{'level'}) ? "$array->{'level'}-$i": $array->{'level'};
 			$status = ($level) ? check_zfs_status($level,\@pool_status): '';
 			$zfs->[$j]{'arrays'}[$k]{'status'} = $status;
-			#print "$level i:$i j:$j k:$k $status\n";
+			# print "$level i:$i j:$j k:$k $status\n";
 			foreach my $component (@components){
 				my @temp = split('~', $component);
 				$status = ($temp[0]) ? check_zfs_status($temp[0],\@pool_status): '';
@@ -15730,26 +17056,32 @@ sub check_zfs_status {
 }
 }
 
-## RamData
+## RamItem
 {
-package RamData;
-
+package RamItem;
+my (@vendors,%vendor_ids);
 sub get {
 	my (@data,@rows,$key1,@ram,$val1);
 	my $num = 0;
-	@rows = main::get_memory_data_full('ram') if !$b_mem;
-	if ( !$b_fake_dmidecode && $alerts{'dmidecode'}->{'action'} ne 'use'){
-		$key1 = $alerts{'dmidecode'}->{'action'};
-		$val1 = $alerts{'dmidecode'}->{$key1};
-		push(@rows, {
-		main::key($num++,1,1,'RAM Report') => '',
-		main::key($num++,0,2,$key1) => $val1,
-		});
+	@rows = MemoryData::full('ram') if !$loaded{'memory'};
+	if ($bsd_type && !$force{'dmidecode'} && ($dboot{'ram'} || $fake{'dboot'})){
+		@ram = dboot_data();
+		if (@ram){
+			@data = ram_output(\@ram,'dboot');
+		}
+		else {
+			$key1 = 'message';
+			$val1 = main::row_defaults('ram-data-dmidecode');
+			@data = ({
+			main::key($num++,1,1,'RAM Report') => '',
+			main::key($num++,0,2,$key1) => $val1,
+			});
+		}
 	}
-	else {
+	elsif ($fake{'dmidecode'} || $alerts{'dmidecode'}->{'action'} eq 'use'){
 		@ram = dmidecode_data();
 		if (@ram){
-			@data = ram_output(\@ram);
+			@data = ram_output(\@ram,'dmidecode');
 		}
 		else {
 			$key1 = 'message';
@@ -15759,20 +17091,33 @@ sub get {
 			main::key($num++,0,2,$key1) => $val1,
 			});
 		}
-		push(@rows,@data);
 	}
+	else {
+		$key1 = $alerts{'dmidecode'}->{'action'};
+		$val1 = $alerts{'dmidecode'}->{'message'};
+		push(@rows, {
+		main::key($num++,1,1,'RAM Report') => '',
+		main::key($num++,0,2,$key1) => $val1,
+		});
+	}
+	push(@rows,@data);
 	eval $end if $b_log;
 	return @rows;
 }
 
 sub ram_output {
 	eval $start if $b_log;
-	my ($ram) = @_;
+	my ($ram,$source) = @_;
 	return if !@$ram;
 	my $num = 0;
 	my $j = 0;
 	my (@rows,$b_non_system);
 	my ($arrays,$modules,$slots,$type_holder) = (0,0,0,'');
+	if ($source eq 'dboot'){
+		push(@rows, {
+		main::key($num++,0,1,'Message') => main::row_defaults('ram-data-complete'),
+		});
+	}
 	foreach my $item (@$ram){
 		$j = scalar @rows;
 		if (!$show{'ram-short'}){
@@ -15793,8 +17138,8 @@ sub ram_output {
 			$item->{'eec'} ||= 'N/A';
 			$rows[$j]->{main::key($num++,0,2,'EC')} = $item->{'eec'};
 			if ($extra > 0 && (!$b_non_system || 
-				( main::is_numeric($item->{'max-module-size'}) && $item->{'max-module-size'} > 10 ) ) ){
-				$rows[$j]->{main::key($num++,1,2,'max module size')} = process_size($item->{'max-module-size'});
+				(main::is_numeric($item->{'max-module-size'}) && $item->{'max-module-size'} > 10))){
+				$rows[$j]->{main::key($num++,1,2,'max-module-size')} = process_size($item->{'max-module-size'});
 				if ($item->{'mod-qualifier'}){
 					$rows[$j]->{main::key($num++,0,3,'note')} = $item->{'mod-qualifier'};
 				}
@@ -15810,7 +17155,7 @@ sub ram_output {
 		foreach my $entry ($item->{'modules'}){
 			next if ref $entry ne 'ARRAY';
 			# print Data::Dumper::Dumper $entry;
-			foreach my $mod ( @$entry){
+			foreach my $mod (@$entry){
 				$num = 1;
 				$j = scalar @rows;
 				# multi array setups will start index at next from previous array
@@ -15827,7 +17172,7 @@ sub ram_output {
 				main::key($num++,0,3,'size') => process_size($mod->{'size'}),
 				});
 				next if ($mod->{'size'} =~ /\D/);
-				if ($extra > 1 && $mod->{'type'} ){
+				if ($extra > 1 && $mod->{'type'}){
 					$rows[$j]->{main::key($num++,0,3,'info')} = $mod->{'type'};
 				}
 				if ($mod->{'speed'} && $mod->{'configured-clock-speed'} && 
@@ -15844,15 +17189,13 @@ sub ram_output {
 							$mod->{'speed'} = $mod->{'configured-clock-speed'};
 							$mod->{'speed-note'} = $mod->{'configured-note'} if $mod->{'configured-note'} ;
 						}
-						# rare instances, dmi type 6, no speed
-						else {
-							$mod->{'speed'} = 'N/A';
-						}
 					}
+					# rare instances, dmi type 6, no speed, dboot also no speed
+					$mod->{'speed'} ||= 'N/A';
 					$rows[$j]->{main::key($num++,1,3,'speed')} = $mod->{'speed'};
 					$rows[$j]->{main::key($num++,0,4,'note')} = $mod->{'speed-note'} if $mod->{'speed-note'};
 				}
-				if ($extra > 0 ){
+				if ($extra > 0){
 					$mod->{'device-type'} ||= 'N/A';
 					$rows[$j]->{main::key($num++,0,3,'type')} = $mod->{'device-type'};
 					if ($extra > 2 && $mod->{'device-type'} ne 'N/A'){
@@ -15860,19 +17203,19 @@ sub ram_output {
 						$rows[$j]->{main::key($num++,0,3,'detail')} = $mod->{'device-type-detail'};
 					}
 				}
-				if ($extra > 2 ){
+				if ($source ne 'dboot' && $extra > 2){
 					$mod->{'data-width'} ||= 'N/A';
-					$rows[$j]->{main::key($num++,0,3,'bus width')} = $mod->{'data-width'};
+					$rows[$j]->{main::key($num++,0,3,'bus-width')} = $mod->{'data-width'};
 					$mod->{'total-width'} ||= 'N/A';
 					$rows[$j]->{main::key($num++,0,3,'total')} = $mod->{'total-width'};
 				}
-				if ($extra > 1 ){
+				if ($source ne 'dboot' && $extra > 1){
 					$mod->{'manufacturer'} ||= 'N/A';
 					$rows[$j]->{main::key($num++,0,3,'manufacturer')} = $mod->{'manufacturer'};
 					$mod->{'part-number'} ||= 'N/A';
 					$rows[$j]->{main::key($num++,0,3,'part-no')} = $mod->{'part-number'};
 				}
-				if ($extra > 2 ){
+				if ($source ne 'dboot' && $extra > 2){
 					$mod->{'serial'} = main::apply_filter($mod->{'serial'});
 					$rows[$j]->{main::key($num++,0,3,'serial')} = $mod->{'serial'};
 				}
@@ -15900,14 +17243,14 @@ sub dmidecode_data {
 	my ($derived_module_size,$max_cap_5,$max_cap_16,$max_module_size) = (0,0,0,0);
 	my ($i,$j,$k) = (0,0,0);
 	my $check = main::row_defaults('note-check');
-	#print Data::Dumper::Dumper \@dmi;
+	# print Data::Dumper::Dumper \@dmi;
 	foreach my $entry (@dmi){
 		## NOTE: do NOT reset these values, that causes failures
 		# ($derived_module_size,$max_cap_5,$max_cap_16,$max_module_size) = (0,0,0,0);
 		if ($entry->[0] == 5){
 			foreach my $item (@$entry){
 				@temp = split(/:\s*/, $item, 2);
-				next if ! $temp[1];
+				next if !$temp[1];
 				if ($temp[0] eq 'Maximum Memory Module Size'){
 					$max_module_size = calculate_size($temp[1],$max_module_size);
 					$ram[$k]->{'max-module-size'} = $max_module_size;
@@ -15928,8 +17271,8 @@ sub dmidecode_data {
 					$ram[$k]->{'eec'} = $temp[1];
 				}
 			}
-			$ram[$k]->{'modules'} = ([],);
-			#print Data::Dumper::Dumper \@ram;
+			$ram[$k]->{'modules'} = [];
+			# print Data::Dumper::Dumper \@ram;
 			$b_5 = 1;
 		}
 		elsif ($entry->[0] == 6){
@@ -15937,12 +17280,12 @@ sub dmidecode_data {
 			my ($bank_locator,$device_type,$locator,$main_locator) = ('','','','');
 			foreach my $item (@$entry){
 				@temp = split(/:\s*/, $item, 2);
-				next if ! $temp[1];
+				next if !$temp[1];
 				if ($temp[0] eq 'Installed Size'){
 					# get module size
 					$size = calculate_size($temp[1],0);
 					# using this causes issues, really only works for 16
-# 					if ($size =~ /^[0-9][0-9]+$/) {
+# 					if ($size =~ /^[0-9][0-9]+$/){
 # 						$ram[$k]->{'device-count-found'}++;
 # 						$ram[$k]->{'used-capacity'} += $size;
 # 					}
@@ -15954,7 +17297,7 @@ sub dmidecode_data {
 				elsif ($temp[0] eq 'Current Speed'){
 					$speed = main::dmi_cleaner($temp[1]);
 				}
-				elsif ($temp[0] eq 'Locator' || $temp[0] eq 'Socket Designation' ){
+				elsif ($temp[0] eq 'Locator' || $temp[0] eq 'Socket Designation'){
 					$temp[1] =~ s/D?RAM slot #?/Slot/i; # can be with or without #
 					$locator = $temp[1];
 				}
@@ -15968,7 +17311,7 @@ sub dmidecode_data {
 			# because of the wide range of bank/slot type data, we will just use
 			# the one that seems most likely to be right. Some have: Bank: SO DIMM 0 slot: J6A
 			# so we dump the useless data and use the one most likely to be visibly correct
-			if ( $bank_locator =~ /DIMM/ ) {
+			if ($bank_locator =~ /DIMM/){
 				$main_locator = $bank_locator;
 			}
 			else {
@@ -15981,7 +17324,7 @@ sub dmidecode_data {
 			'speed' => $speed,
 			'type' => $type,
 			};
-			#print Data::Dumper::Dumper \@ram;
+			# print Data::Dumper::Dumper \@ram;
 			$j++;
 		}
 		elsif ($entry->[0] == 16){
@@ -15991,12 +17334,12 @@ sub dmidecode_data {
 			# ($derived_module_size,$max_cap_16) = (0,0);
 			foreach my $item (@$entry){
 				@temp = split(/:\s*/, $item, 2);
-				next if ! $temp[1];
+				next if !$temp[1];
 				if ($temp[0] eq 'Maximum Capacity'){
 					$max_cap_16 = calculate_size($temp[1],$max_cap_16);
 					$ram[$handle]->{'max-capacity-16'} = $max_cap_16;
 				}
-				# note: these 3 have cleaned data in set_dmidecode_data, so replace stuff manually
+				# note: these 3 have cleaned data in DmiData, so replace stuff manually
 				elsif ($temp[0] eq 'Location'){
 					$temp[1] =~ s/\sOr\sMotherboard//;
 					$temp[1] ||= 'System Board';
@@ -16013,21 +17356,24 @@ sub dmidecode_data {
 				elsif ($temp[0] eq 'Number Of Devices'){
 					$ram[$handle]->{'slots-16'} = $temp[1];
 				}
-				#print "0: $temp[0]\n";
+				# print "0: $temp[0]\n";
 			}
 			$ram[$handle]->{'derived-module-size'} = 0;
 			$ram[$handle]->{'device-count-found'} = 0;
 			$ram[$handle]->{'used-capacity'} = 0;
-			#print "s16: $ram[$handle]->{'slots-16'}\n";
+			# print "s16: $ram[$handle]->{'slots-16'}\n";
 		}
 		elsif ($entry->[0] == 17){
-			my ($bank_locator,$configured_speed,$configured_note,$data_width) = ('','','','');
-			my ($device_type,$device_type_detail,$form_factor,$locator,$main_locator) = ('','','','','');
-			my ($manufacturer,$part_number,$serial,$speed,$speed_note,$total_width) = ('','','','','','');
+			my ($bank_locator,$configured_speed,$configured_note,
+			$data_width) = ('','','','');
+			my ($device_type,$device_type_detail,$form_factor,$locator,
+			$main_locator) = ('','','','','');
+			my ($manufacturer,$vendor_id,$part_number,$serial,$speed,$speed_note,
+			$total_width) = ('','','','','','','');
 			my ($device_size,$i_data,$i_total,$working_size) = (0,0,0,0);
 			foreach my $item (@$entry){
 				@temp = split(/:\s*/, $item, 2);
-				next if ! $temp[1];
+				next if !$temp[1];
 				if ($temp[0] eq 'Array Handle'){
 					$handle = hex($temp[1]);
 				}
@@ -16040,7 +17386,7 @@ sub dmidecode_data {
 				# do not try to guess from installed modules, only use this to correct type 5 data
 				elsif ($temp[0] eq 'Size'){
 					# we want any non real size data to be preserved
-					if ( $temp[1] =~ /^[0-9]+\s*[KkMTPG]B/ ) {
+					if ($temp[1] =~ /^[0-9]+\s*[KkMTPG]i?B/){
 						$derived_module_size = calculate_size($temp[1],$derived_module_size);
 						$working_size = calculate_size($temp[1],0);
 						$device_size = $working_size;
@@ -16089,13 +17435,13 @@ sub dmidecode_data {
 			# because of the wide range of bank/slot type data, we will just use
 			# the one that seems most likely to be right. Some have: Bank: SO DIMM 0 slot: J6A
 			# so we dump the useless data and use the one most likely to be visibly correct
-			if ( $bank_locator =~ /DIMM/ ) {
+			if ($bank_locator =~ /DIMM/){
 				$main_locator = $bank_locator;
 			}
 			else {
 				$main_locator = $locator;
 			}
-			if ($working_size =~ /^[0-9][0-9]+$/) {
+			if ($working_size =~ /^[0-9][0-9]+$/){
 				$ram[$handle]->{'device-count-found'}++;
 				# build up actual capacity found for override tests
 				$ram[$handle]->{'used-capacity'} += $working_size;
@@ -16113,6 +17459,20 @@ sub dmidecode_data {
 				$data_width = $total_width;
 				$total_width = $temp_width;
 			}
+			if ($manufacturer && $manufacturer =~ /^([a-f0-9]{4})$/i){
+				$vendor_id = lc($1) if $1;
+			}
+			if ((!$manufacturer || $vendor_id)  && $part_number){
+				my @result = ram_vendor($part_number);
+				$manufacturer = $result[0] if $result[0];
+				$part_number = $result[1] if $result[1];
+			}
+			if ($vendor_id && !$manufacturer){
+				set_vendor_ids() if !%vendor_ids;
+				if ($vendor_ids{$vendor_id}){
+					$manufacturer = $vendor_ids{$vendor_id};
+				}
+			}
 			$ram[$handle]->{'derived-module-size'} = $derived_module_size;
 			$ram[$handle]->{'modules'}[$i]{'configured-clock-speed'} = $configured_speed;
 			$ram[$handle]->{'modules'}[$i]{'configured-note'} = $configured_note if $configured_note;
@@ -16123,6 +17483,7 @@ sub dmidecode_data {
 			$ram[$handle]->{'modules'}[$i]{'form-factor'} = $form_factor;
 			$ram[$handle]->{'modules'}[$i]{'locator'} = $main_locator;
 			$ram[$handle]->{'modules'}[$i]{'manufacturer'} = $manufacturer;
+			$ram[$handle]->{'modules'}[$i]{'vendor-id'} = $vendor_id;
 			$ram[$handle]->{'modules'}[$i]{'part-number'} = $part_number;
 			$ram[$handle]->{'modules'}[$i]{'serial'} = $serial;
 			$ram[$handle]->{'modules'}[$i]{'speed'} = $speed;
@@ -16130,16 +17491,102 @@ sub dmidecode_data {
 			$ram[$handle]->{'modules'}[$i]{'total-width'} = $total_width;
 			$i++
 		}
-		elsif ($entry->[0] < 17 ){
+		elsif ($entry->[0] < 17){
 			next;
 		}
-		elsif ($entry->[0] > 17 ){
+		elsif ($entry->[0] > 17){
 			last;
 		}
 	}
+	print Data::Dumper::Dumper \@ram if $dbg[36];
+	main::log_data('dump','@ram',\@ram) if $b_log;
 	@ram = process_data(\@ram) if @ram;
 	main::log_data('dump','@ram',\@ram) if $b_log;
-	# print Data::Dumper::Dumper \@ram;
+	print Data::Dumper::Dumper \@ram if $dbg[36];
+	eval $end if $b_log;
+	return @ram;
+}
+sub dboot_data {
+	eval $start if $b_log;
+	my (@ram);
+	my $est = main::row_defaults('note-est');
+	my ($arr,$derived_module_size,$subtract) = (0,0,0);
+	my ($holder);
+	foreach (@{$dboot{'ram'}}){
+		my ($addr,$detail,$device_detail,$ecc,$iic,$locator,$size,$speed,$type);
+		# note: seen one netbsd with multiline spdmem0/1 etc but not consistent so don't use
+		if (/^(spdmem([\d]+)):at iic([\d]+)(\saddr 0x([0-9a-f]+))?/){
+			$iic = $3;
+			$locator = $1;
+			$holder = $iic if !defined $holder; # prime for first use
+			# note: seen iic2 as only device
+			if ($iic != $holder){
+				if ($ram[$arr] && $ram[$arr]->{'slots-16'}){
+					$subtract += $ram[$arr]->{'slots-16'};
+				}
+				$holder = $iic;
+				# then since we are on a new iic device, assume new ram array.
+				# this needs more data to confirm this guess.
+				$arr++; 
+			}
+			if ($5){
+				$addr = hex($5);
+			}
+			if (/(non?[\s-]parity)/i){
+				$device_detail = $1;
+				$ecc = 'None';
+			}
+			elsif (/EEC/i){
+				$device_detail = 'EEC';
+				$ecc = 'EEC';
+			}
+			if (/\b(PC[0-9]+-\S+)\b/){
+				$speed = $1;
+				my $temp = speed_mapper($speed);
+				if ($temp ne $speed){
+					$detail = $speed;
+					$speed = $temp;
+				}
+			}
+			# we want to avoid netbsd trying to complete @ram without real data
+			if (/:(\d+[MGT])B?\s(DDR[0-9]*)\b/){
+				$size = main::translate_size($1)/1024;
+				$type = $2;
+				if ($addr){
+					$ram[$arr]->{'slots-16'} = $addr - 80 + 1 - $subtract;
+					$locator = 'Slot-' . $ram[$arr]->{'slots-16'};
+				}
+				$ram[$arr]->{'device-count-found'}++;
+				# build up actual capacity found for override tests
+				$ram[$arr]->{'max-capacity-16'} += $size;
+				$ram[$arr]->{'max-cap-qualifier'} = $est;
+				$ram[$arr]->{'slots-16'}++ if !$addr;
+				$derived_module_size = $size if $size > $derived_module_size;
+				$ram[$arr]->{'slots-qualifier'} = $est;
+				$ram[$arr]->{'eec'} = $ecc;
+				$ram[$arr]->{'derived-module-size'} = $derived_module_size;
+				push(@{$ram[$arr]->{'modules'}},{
+				'device-type'  => $type,
+				'device-type-detail'  => $detail,
+				'locator' => $locator,
+				'size' => $size,
+				'speed' => $speed,
+				});
+			}
+		}
+	}
+	for (my $i = 0; $i++ ;scalar @ram){
+		next if ref $ram[$i] ne 'HASH';
+		# 1 slot is possible, but 3 is very unlikely due to dual channel ddr
+		if ($ram[$i]->{'slots'} && $ram[$i]->{'slots'} > 2 && $ram[$i]->{'slots'} % 2 == 1){
+			$ram[$i]->{'slots'}++;
+		}
+	}
+	print Data::Dumper::Dumper \@ram if $dbg[36];
+	main::log_data('dump','@ram',\@ram) if $b_log;
+	@ram = process_data(\@ram) if @ram;
+	main::log_data('dump','@ram',\@ram) if $b_log;
+	print Data::Dumper::Dumper \@ram if $dbg[36];
 	eval $end if $b_log;
 	return @ram;
 }
@@ -16171,37 +17618,36 @@ sub process_data {
 			print "1: mms: $item->{'max-module-size'} :dms: $item->{'derived-module-size'} :mc: $max_cap :uc: $item->{'used-capacity'}\n";
 			print "1a: s5: $item->{'slots-5'} s16: $item->{'slots-16'}\n";
 		}
-		if (!$max_cap && $item->{'max-capacity-5'}) {
+		if (!$max_cap && $item->{'max-capacity-5'}){
 			$max_cap = $item->{'max-capacity-5'};
 		}
 		if ($b_debug){
 			print "2: mms: $item->{'max-module-size'} :dms: $item->{'derived-module-size'} :mc: $max_cap :uc: $item->{'used-capacity'}\n";
 		}
 		# 2: now check to see if actually found module sizes are > than listed max module, replace if >
-		if ( $item->{'max-module-size'} && $item->{'derived-module-size'} && 
-		     $item->{'derived-module-size'} > $item->{'max-module-size'} ){
+		if ($item->{'max-module-size'} && $item->{'derived-module-size'} && 
+		     $item->{'derived-module-size'} > $item->{'max-module-size'}){
 			$item->{'max-module-size'} = $item->{'derived-module-size'};
 			$est_mod = $est;
 		}
 		if ($b_debug){
 			print "3: dcf: $item->{'device-count-found'} :dms: $item->{'derived-module-size'} :mc: $max_cap :uc: $item->{'used-capacity'}\n";
 		}
-		
 		# note: some cases memory capacity == max module size, so one stick will fill it
 		# but I think only with cases of 2 slots does this happen, so if > 2, use the count of slots.
-		if ($max_cap && ($item->{'device-count-found'} || $item->{'slots-16'}) ){
+		if ($max_cap && ($item->{'device-count-found'} || $item->{'slots-16'})){
 			# first check that actual memory found is not greater than listed max cap, or
 			# checking to see module count * max mod size is not > used capacity
 			if ($item->{'used-capacity'} && $item->{'max-capacity-16'}){
 				if ($item->{'used-capacity'} > $max_cap){
 					if ($item->{'max-module-size'} && 
-					  $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'max-module-size'} )){
+					  $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'max-module-size'})){
 						$max_cap = $item->{'slots-16'} * $item->{'max-module-size'};
 						$est_cap = $est;
 						print "A\n" if $b_debug;
 					}
 					elsif ($item->{'derived-module-size'} && 
-					  $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'derived-module-size'}) ){
+					  $item->{'used-capacity'} < ($item->{'slots-16'} * $item->{'derived-module-size'})){
 						$max_cap = $item->{'slots-16'} * $item->{'derived-module-size'};
 						$est_cap = $est;
 						print "B\n" if $b_debug;
@@ -16218,12 +17664,12 @@ sub process_data {
 			if (!$est_cap){
 				# do not do this for only single modules found, max mod size can be equal to the array size
 				if ($item->{'slots-16'} > 1 && $item->{'device-count-found'} > 1 && 
-				  $max_cap < ($item->{'derived-module-size'} * $item->{'slots-16'} ) ){
+				  $max_cap < ($item->{'derived-module-size'} * $item->{'slots-16'})){
 					$max_cap = $item->{'derived-module-size'} * $item->{'slots-16'};
 					$est_cap = $est;
 					print "D\n" if $b_debug;
 				}
-				elsif ($item->{'device-count-found'} > 0 && $max_cap < ( $item->{'derived-module-size'} * $item->{'device-count-found'} )){
+				elsif ($item->{'device-count-found'} > 0 && $max_cap < ($item->{'derived-module-size'} * $item->{'device-count-found'})){
 					$max_cap = $item->{'derived-module-size'} * $item->{'device-count-found'};
 					$est_cap = $est;
 					print "E\n" if $b_debug;
@@ -16233,7 +17679,7 @@ sub process_data {
 				elsif ($item->{'max-module-size'} > 0 &&
 				  ($item->{'max-module-size'} * $item->{'slots-16'}) == $item->{'max-capacity-5'} &&
 				  $item->{'max-capacity-5'} != $item->{'max-capacity-16'} &&
-				  $item->{'derived-module-size'} != ($item->{'max-capacity-16'}/$item->{'slots-16'}) ){
+				  $item->{'derived-module-size'} != ($item->{'max-capacity-16'}/$item->{'slots-16'})){
 					$max_cap = $item->{'max-capacity-5'};
 					$est_cap = $est;
 					print "F\n" if $b_debug;
@@ -16254,7 +17700,7 @@ sub process_data {
 			# now prep for rebuilding the ram array data 
 			if (!$item->{'max-module-size'}){
 				# ie: 2x4gB
-				if (!$est_cap && $item->{'derived-module-size'} > 0 && $max_cap > ($item->{'derived-module-size'} * $item->{'slots-16'} * 4) ){
+				if (!$est_cap && $item->{'derived-module-size'} > 0 && $max_cap > ($item->{'derived-module-size'} * $item->{'slots-16'} * 4)){
 					$est_cap = $check;
 					print "G\n" if $b_debug;
 				}
@@ -16282,7 +17728,7 @@ sub process_data {
 			# listed max cap, 8gb, max mod 2gb, slots 2
 			else {
 				if (!$est_cap && $item->{'max-module-size'} > 0){
-					if ($max_cap > ( $item->{'max-module-size'} * $item->{'slots-16'})){
+					if ($max_cap > ($item->{'max-module-size'} * $item->{'slots-16'})){
 						$est_cap = $check;
 						print "K\n" if $b_debug;
 					}
@@ -16297,6 +17743,11 @@ sub process_data {
 			$item->{'slots-16'} = scalar @{$item->{'modules'}};
 			print "L\n" if $b_debug;
 		}
+		# only bsds using dmesg data
+		elsif ($item->{'slots-qualifier'}){
+			$est_slots = $item->{'slots-qualifier'};
+			$est_cap = $est;
+		}
 		push(@return, {
 		'capacity' => $max_cap,
 		'cap-qualifier' => $est_cap,
@@ -16318,12 +17769,12 @@ sub process_speed {
 	my ($speed,$device_type,$check) = @_;
 	my $speed_note;
 	$speed = main::dmi_cleaner($speed) if $speed;
-	if ($device_type && $device_type =~ /ddr/i && $speed && $speed =~ /^([0-9]+) MHz/){
+	if ($device_type && $device_type =~ /ddr/i && $speed && $speed =~ /^([0-9]+)\s*MHz/){
 		$speed = ($1 * 2) . " MT/s ($speed)";
 	}
 	# seen cases of 1 MT/s, 61690 MT/s, not sure why, bug
 	# crucial is shipping 5100 MT/s now, and 6666 has been hit, so speeds can hit 10k
-	if ($speed && $speed =~ /^([0-9]+) M/){
+	if ($speed && $speed =~ /^([0-9]+)\s*M/){
 		$speed_note = $check if $1 < 50 || $1 > 20000 ;
 	}
 	return ($speed,$speed_note);
@@ -16333,69 +17784,190 @@ sub process_speed {
 sub process_size {
 	my ($size) = @_;
 	my ($b_trim,$unit) = (0,'');
-	#print "size0: $size\n";
+	# print "size0: $size\n";
 	return 'N/A' if !$size;
 	#return $size if $size =~ /\D/;
 	return $size if !main::is_numeric($size);
-	#print "size: $size\n";
-	if ( $size < 1024 ){
-		$unit='MiB';
-	}
-	elsif ( $size < 1024000 ){
-		$size = $size / 1024;
-		$unit='GiB';
-		$b_trim = 1;
-	}
-	elsif ( $size < 1024000000 ){
-		$size = $size / 1024000;
-		$unit='TiB';
-		$b_trim = 1;
-	}
+	# print "size: $size\n";
 	# we only want a max 2 decimal places, and only when it's 
-	# a unit > MB
+	# a unit > 1 GiB
+	$b_trim = 1 if $size > 1024;
+	# switch it back to KiB for tool
+	($size,$unit) = main::get_size($size * 1024);
 	$size = sprintf("%.2f",$size) if $b_trim;
 	$size =~ s/\.[0]+$//;
 	$size = "$size $unit";
 	return $size;
 }
+# note that even though MB should be 1000^x it's actually 
+# MiB etc. As with process_size, this uses MiB not KiB
 sub calculate_size {
 	my ($data, $size) = @_;
 	# technically k is KiB, K is KB but can't trust that
-	if ( $data =~ /^[0-9]+\s*[kKGMTP]B/) {
-		if ( $data =~ /([0-9]+)\s*GB/ ) {
-			$data = $1 * 1024;
-		}
-		elsif ( $data =~ /([0-9]+)\s*MB/ ) {
-			$data = $1;
-		}
-		elsif ( $data =~ /([0-9]+)\s*TB/ ) {
-			$data = $1 * 1024 * 1000;
-		}
-		elsif ( $data =~ /([0-9]+)\s*PB/ ) {
-			$data = $1 * 1024 * 1000 * 1000;
-		}
-		elsif ( $data =~ /([0-9]+)\s*[kK]B/ ) {
-			$data = $1/1024;
-			#print "d3:$data\n";
-		}
-		#print "d1a: $data s1: $size\n";
-		if (main::is_numeric($data) && $data > $size ) {
-		#if ($data =~ /^[0-9][0-9]+$/ && $data > $size ) {
-			$size = $data;
-		}
-		#print "d1b: $data s1: $size\n";
+	if ($data =~ /^([0-9]+\s*[kKGMTP])i?B/){
+		my $working = $1;
+		# this converts it to KiB
+		my $working_size = main::translate_size($working);
+		# but we want it back in MiB for RAM, that should get fixed
+		$working_size = $working_size/1024 if $working_size;
+		# print "ws-a: $working_size s-1: $size\n";
+		if (main::is_numeric($working_size) && $working_size > $size){
+			$size = $working_size;
+		}
+		# print "ws-b: $working_size s-2: $size\n";
 	}
 	else {
 		$size = 0;
 	}
-	#print "d2: $data s2: $size\n";
+	# print "d-2: $data s-3: $size\n";
 	return $size;
 }
+sub speed_mapper {
+	my ($type) = @_;
+	my %speeds = (
+	# DDR
+	'PC-1600' => 200,
+	'PC-2100' => 266,
+	'PC-2400' => 300,
+	'PC-2700' => 333,
+	'PC-3200' => 400,
+	# DDR2
+	'PC2-3200' => 400,
+	'PC2-4200' => 533,
+	'PC2-5300' => 667,
+	'PC2-6400' => 800,
+	'PC2-8000' => 1000,
+	# DDR3
+	'PC3-6400' => 800,
+	'PC3-8500' => 1066,
+	'PC3-10600' => 1333,
+	'PC3-12800' => 1600,
+	# DDR4
+	'PC4-19200' => 2400,
+	'PC4-21300' => 2666,
+	'PC4-23400' => 2933,
+	'PC4-24000' => 3000,
+	'PC4-25600' => 3200,
+	'PC4-28800' => 3600,
+	'PC4-32000' => 4000,
+	'PC4-35200' => 4400,
+	# DDR5
+	'PC5-38400' => 4800,
+	'PC5-51200' => 6400,
+	# DDR6, coming...
+	);
+	return ($speeds{$type}) ?  $speeds{$type} . ' MT/s' : $type;
+}
+sub set_vendors {
+	@vendors = (
+	# A-Data xpg: AX4U; AX\d{4} for axiom
+	['^(A[DX]\dU|AVD|A[\s-]?Data)','A[\s-]?Data','A-Data',''],
+	['^(A[\s-]?Tech)','A[\s-]?Tech','A-Tech',''], # don't know part nu
+	['^(AX[\d]{4}|Axiom)','Axiom','Axiom',''],
+	['^(BD\d|Black[s-]?Diamond)','Black[s-]?Diamond','Black Diamond',''],
+	['^(-BN$|Brute[s-]?Networks)','Brute[s-]?Networks','Brute Networks',''],
+	['^(CM|Corsair)','Corsair','Corsair',''],
+	['^(CT\d|BL|Crucial)','Crucial','Crucial',''],
+	['^(CY|Cypress)','Cypress','Cypress',''],
+	['^(SNP|Dell)','Dell','Dell',''],
+	['^(PE[\d]{4}|Edge)','Edge','Edge',''],
+	['^(Elpida|EB)','^Elpida','Elpida',''],
+	['^(GVT|Galvantech)','Galvantech','Galvantech',''],
+	# if we get more G starters, make rules tighter
+	['^(G[A-Z]|Geil)','Geil','Geil',''],
+	# Note: FA- but make loose FA
+	['^(F4|G[\s\.-]?Skill)','G[\s\.-]?Skill','G.Skill',''], 
+	['^(HP)','','HP',''], # no IDs found
+	['^(HX|HyperX)','HyperX','HyperX',''],
+	# qimonda spun out of infineon, same ids
+	# ['^(HYS]|Qimonda)','Qimonda','Qimonda',''],
+	['^(HY|Infineon)','Infineon','Infineon',''],#HY[A-Z]\d
+	['^(KSM|KVR|Kingston)','Kingston','Kingston',''],
+	['^(MT|Micron)','Micron','Micron',''],
+	# seen: 992069 991434 997110S
+	['^(M[BLERS][A-Z][1-7]|99[0-9]{3}|Mushkin)','Mushkin','Mushkin',''],
+	['^(OCZ)','^OCZ\b','OCZ',''],
+	['^([MN]D\d|OLOy)','OLOy','OLOy',''],
+	['^(M[ERS]\d|Nemix)','Nemix','Nemix',''],
+	# before patriot just in case
+	['^(MN\d|PNY)','PNY\s','PNY',''],
+	['^(P[A-Z]|Patriot)','Patriot','Patriot',''],
+	['^(K[1-6][ABT]|K[1-6][\d]{3}|M[\d]{3}[A-Z]|Samsung)','Samsung','Samsung',''],
+	['^(SP|Silicon[\s-]?Power)','Silicon[\s-]?Power','Silicon Power',''],
+	['^(STK|Simtek)','Simtek','Simtek',''],
+	['^(HM[ACT]|SK[\s-]?Hynix)','SK[\s-]?Hynix','SK-Hynix',''],
+	# TED TTZD TLRD TDZAD TF4D4 TPD4 TXKD4 seen: HMT but could by skh
+	#['^(T(ED|D[PZ]|F\d|LZ|P[DR]T[CZ]|XK)|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''],
+	['^(T[^\dR]|Team[\s-]?Group)','Team[\s-]?Group','TeamGroup',''],
+	['^(TR\d|JM\d|Transcend)','Transcend','Transcend',''],
+	['^(VK\d|Vaseky)','Vaseky','Vaseky',''],
+	);
+}
+# note: many of these are pci ids, not confirmed valid for ram
+sub set_vendor_ids {
+	%vendor_ids = {
+	'01f4' => 'Transcend',# confirmed
+	'02fe' => 'Elpida',# confirmed
+	'0314' => 'Mushkin',# confirmed
+	'1014' => 'IBM',
+	'1099' => 'Samsung',
+	'10c3' => 'Samsung',
+	'11e2' => 'Samsung',
+	'1249' => 'Samsung',
+	'144d' => 'Samsung',
+	'15d1' => 'Infineon',
+	'167d' => 'Samsung',
+	'196e' => 'PNY',
+	'1b1c' => 'Corsair',
+	'1b85' => 'OCZ',
+	'1c5c' => 'SK-Hynix',
+	'1cc1' => 'A-Data',
+	'0215' => 'Corsair',# confirmed
+	'2646' => 'Kingston',
+	'2c00' => 'Micron',# confirmed
+	'5105' => 'Qimonda',# confirmed
+	'802c' => 'Micron',# confirmed
+	'80ad' => 'SK-Hynix',# confirmed
+	'80ce' => 'Samsung',# confirmed
+	'8551' => 'Qimonda',# confirmed
+	'8564' => 'Transcend',
+	'ad00' => 'SK-Hynix',# confirmed
+	'c0a9' => 'Crucial',
+	'ce00' => 'Samsung',# confirmed
+	# '' => '',
+	}
+}
+sub ram_vendor {
+	eval $end if $b_log;
+	my ($id) = $_[0];
+	set_vendors() if !@vendors;
+	my ($vendor,@data);
+	foreach my $row (@vendors){
+		if ($id =~ /$row->[0]/i){
+			$vendor = $row->[2];
+			# Usually we want to assign N/A at output phase, maybe do this logic there?
+			if ($row->[1]){
+				if ($id !~ m/$row->[1]$/i){
+					$id =~ s/$row->[1]//i;
+				}
+				else {
+					$id = 'N/A';
+				}
+			}
+			$id =~ s/^[\/\[\s_-]+|[\/\s_-]+$//g;
+			$id =~ s/\s\s/ /g;
+			@data = ($vendor,$id);
+			last;
+		}
+	}
+	eval $end if $b_log;
+	return @data;
+}
 }
 
-## RepoData
+## RepoItem
 {
-package RepoData;
+package RepoItem;
 
 # easier to keep these package global, but undef after done
 my (@dbg_files,$debugger_dir);
@@ -16404,13 +17976,12 @@ sub get {
 	eval $start if $b_log;
 	($debugger_dir) = @_;
 	my (@data,@rows,@rows_p,@rows_r);
-	if ($extra > 0 && !$b_pkg){
+	if ($extra > 0 && !$loaded{'package-data'}){
 		my %packages = PackageData::get('main',\$num);
 		my @data;
 		for (keys %packages){
 			$rows_p[0]->{$_} = $packages{$_};
 		}
-		$b_pkg = 1;
 	}
 	$num = 0;
 	if ($bsd_type){
@@ -16426,10 +17997,14 @@ sub get {
 	}
 	else {
 		if (!@rows_r){
-			my $pm = (!$bsd_type) ? 'package manager': 'OS type';
-			@data = (
-			{main::key($num++,0,1,'Alert') => "No repo data detected. Does $self_name support your $pm?"},
-			);
+			my $pm_missing;
+			if ($bsd_type){
+				$pm_missing = main::row_defaults('repo-data-bsd',$uname[0]);
+			}
+			else {
+				$pm_missing = main::row_defaults('repo-data');
+			}
+			@data = ({main::key($num++,0,1,'Alert') => $pm_missing});
 		}
 		@rows = (@rows_p,@rows_r,@data);
 	}
@@ -16445,12 +18020,16 @@ sub get_repos_linux {
 	my $apt_termux = '/data/data/com.termux/files/usr' . $apt;
 	$apt = $apt_termux if -e $apt_termux; # for android termux
 	my $cards = '/etc/cards.conf';
+	my $dnf_conf = '/etc/dnf/dnf.conf';
+	my $dnf_repo_dir = '/etc/dnf.repos.d/';
 	my $eopkg_dir = '/var/lib/eopkg/';
+	my $nix = '/etc/nix/nix.conf';
 	my $pacman = '/etc/pacman.conf';
 	my $pacman_g2 = '/etc/pacman-g2.conf';
 	my $pisi_dir = '/etc/pisi/';
 	my $portage_dir = '/etc/portage/repos.conf/';
 	my $portage_gentoo_dir = '/etc/portage-gentoo/repos.conf/';
+	my $scratchpkg = '/etc/scratchpkg.repo';
 	my $slackpkg = '/etc/slackpkg/mirrors';
 	my $slackpkg_plus = '/etc/slackpkg/slackpkgplus.conf';
 	my $slapt_get = '/etc/slapt-get/';
@@ -16471,7 +18050,7 @@ sub get_repos_linux {
 		my $counter = 0;
 		@files = main::globber("$apt.d/*.list");
 		push(@files, $apt);
-		main::log_data('data',"apt repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
+		main::log_data('data',"apt repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach (sort @files){
 			# altlinux/pclinuxos use rpms in apt files
 			@data = repo_builder($_,'apt','^\s*(deb|rpm)') if -r $_;
@@ -16479,18 +18058,18 @@ sub get_repos_linux {
 		}
 		#@files = main::globber("$ENV{'HOME'}/bin/scripts/inxi/data/repo/apt/*.sources");
 		@files = main::globber("$apt.d/*.sources");
-		main::log_data('data',"apt deb822 repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
+		main::log_data('data',"apt deb822 repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach $file (@files){
 			# critical: whitespace is the separator, no logical ordering of 
 			# field names exists within each entry.
 			@data2 = main::reader($file);
-			#print Data::Dumper::Dumper \@data2;
+			# print Data::Dumper::Dumper \@data2;
 			if (@data2){
 				@data2 = map {s/^\s*$/~/;$_} @data2;
 				push(@data2, '~');
 			}
 			push(@dbg_files, $file) if $debugger_dir;
-			#print "$file\n";
+			# print "$file\n";
 			@apt_urls = ();
 			@apt_working = ();
 			$b_apt_enabled = 1;
@@ -16501,20 +18080,20 @@ sub get_repos_linux {
 				next if $row =~ /^\s+/ && $row !~ /^\s+[^#]+:\//; 
 				# strip out line space starters now that it's safe 
 				$row =~ s/^\s+//;
-				#print "$row\n";
+				# print "$row\n";
 				if ($row eq '~'){
 					if (@apt_working && $b_apt_enabled){
-						#print "1: url builder\n";
+						# print "1: url builder\n";
 						foreach $repo (@apt_working){
 							$string = $apt_types;
 							$string .= ' [arch=' . $apt_arch . ']' if $apt_arch;
 							$string .= ' ' . $repo;
 							$string .= ' ' . $apt_suites if $apt_suites ;
 							$string .= ' ' . $apt_comp if $apt_comp;
-							#print "s1:$string\n";
+							# print "s1:$string\n";
 							push(@data3, $string);
 						}
-						#print join("\n",@data3),"\n";
+						# print join("\n",@data3),"\n";
 						push(@apt_urls,@data3);
 					}
 					@data3 = ();
@@ -16525,9 +18104,9 @@ sub get_repos_linux {
 					$apt_types = '';
 					$b_apt_enabled = 1;
 				}
-				#print "row:$row\n";
+				# print "row:$row\n";
 				elsif ($row =~ /^Types:\s*(.*)/i){
-					#print "ath:$type_holder\n";
+					# print "ath:$type_holder\n";
 					$apt_types = $1;
 				}
 				elsif ($row =~ /^Enabled:\s*(.*)/i){
@@ -16551,7 +18130,7 @@ sub get_repos_linux {
 			}
 			if (@apt_urls){
 				$key = repo_data('active','apt');
-				@apt_urls = url_cleaner(\@apt_urls);
+				url_cleaner(\@apt_urls);
 			}
 			else {
 				$key = repo_data('missing','apt');
@@ -16566,7 +18145,7 @@ sub get_repos_linux {
 	# pacman: Arch and derived
 	if (-f $pacman || -f $pacman_g2){
 		$repo = 'pacman';
-		if (-f $pacman_g2 ){
+		if (-f $pacman_g2){
 			$pacman = $pacman_g2;
 			$repo = 'pacman-g2';
 		}
@@ -16626,7 +18205,7 @@ sub get_repos_linux {
 				@data2 = split(/\s*=\s*/, $row);
 				@data2 = map { $_ =~ s/^\s+|\s+$//g ; $_ } @data2;
 				last if $data2[0] =~ /^SLACKPKGPLUS/i && $data2[1] eq 'off';
-				# REPOPLUS=( slackpkgplus restricted alienbob ktown multilib slacky)
+				# REPOPLUS=(slackpkgplus restricted alienbob ktown multilib slacky)
 				if ($data2[0] =~ /^REPOPLUS/i){
 					@repoplus_list = split(/\s+/, $data2[1]);
 					@repoplus_list = map {s/\(|\)//g; $_} @repoplus_list;
@@ -16645,36 +18224,44 @@ sub get_repos_linux {
 				$key = repo_data('missing','slackpkg+');
 			}
 			else {
-				@content = url_cleaner(\@content);
+				url_cleaner(\@content);
 				$key = repo_data('active','slackpkg+');
 			}
 			@data = (
 			{main::key($num++,1,1,$key) => $slackpkg_plus},
 			[@content],
 			);
-			@data = url_cleaner(\@data);
+			url_cleaner(\@data);
 			push(@rows,@data);
 			@content = ();
 		}
 	}
 	# redhat/suse
-	if (-d $yum_repo_dir || -f $yum_conf || -d $zypp_repo_dir){
-		if (-d $yum_repo_dir || -f $yum_conf){
-			@files = main::globber("$yum_repo_dir*.repo");
-			push(@files, $yum_conf) if -f $yum_conf;
-			$repo = 'yum';
-		}
-		elsif (-d $zypp_repo_dir){
-			@files = main::globber("$zypp_repo_dir*.repo");
+	if (-f $dnf_conf  ||-d $dnf_repo_dir|| -d $yum_repo_dir || -f $yum_conf || 
+	 -d $zypp_repo_dir){
+		@files = ();
+		push(@files, $dnf_conf) if -f $dnf_conf;
+		push(@files, main::globber("$dnf_repo_dir*.repo")) if -d $dnf_repo_dir;
+		push(@files, $yum_conf) if -f $yum_conf;
+		push(@files, main::globber("$yum_repo_dir*.repo")) if -d $yum_repo_dir;
+		if (-d $zypp_repo_dir){
+			push(@files, main::globber("$zypp_repo_dir*.repo"));
 			main::log_data('data',"zypp repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
-			$repo = 'zypp';
 		}
- 		#$repo = 'yum';
- 		#push(@files, "$ENV{'HOME'}/bin/scripts/inxi/data/repo/yum/rpmfusion-nonfree-1.repo");
+ 		# push(@files, "$ENV{'HOME'}/bin/scripts/inxi/data/repo/yum/rpmfusion-nonfree-1.repo");
 		if (@files){
 			foreach (sort @files){
 				@data2 = main::reader($_);
 				push(@dbg_files, $_) if $debugger_dir;
+				if (/yum/){
+					$repo = 'yum';
+				}
+				elsif (/dnf/){
+					$repo = 'dnf';
+				}
+				elsif(/zypp/){
+					$repo = 'zypp';
+				}
 				my ($enabled,$url,$title) = (undef,'','');
 				foreach my $line (@data2){
 					# this is a hack, assuming that each item has these fields listed, we collect the 3
@@ -16715,11 +18302,12 @@ sub get_repos_linux {
 				if ($url && $title && $enabled){
 					push(@content, "$title ~ $url");
 				}
+				
 				if (! @content){
 					$key = repo_data('missing',$repo);
 				}
 				else {
-					@content = url_cleaner(\@content);
+					url_cleaner(\@content);
 					$key = repo_data('active',$repo);
 				}
 				push(@rows, 
@@ -16732,7 +18320,7 @@ sub get_repos_linux {
 		# print Data::Dumper::Dumper \@rows;
 	}
 	# gentoo 
-	if ( (-d $portage_dir || -d $portage_gentoo_dir ) && main::check_program('emerge')){
+	if ((-d $portage_dir || -d $portage_gentoo_dir) && main::check_program('emerge')){
 		@files = (main::globber("$portage_dir*.conf"),main::globber("$portage_gentoo_dir*.conf"));
 		$repo = 'portage';
 		if (@files){
@@ -16782,7 +18370,7 @@ sub get_repos_linux {
 					$key = repo_data('missing','portage');
 				}
 				else {
-					@content = url_cleaner(\@content);
+					url_cleaner(\@content);
 					$key = repo_data('active','portage');
 				}
 				push(@rows, 
@@ -16798,6 +18386,11 @@ sub get_repos_linux {
 		@data = repo_builder($apk,'apk','^\s*[^#]+');
 		push(@rows,@data);
 	}
+	# Venom
+	if (-f $scratchpkg){
+		@data = repo_builder($scratchpkg,'scratchpkg','^[[:space:]]*[^#]+');
+		push(@rows,@data);
+	}
 	# cards/nutyx
 	if (-f $cards){
 		@data3 = main::reader($cards,'clean');
@@ -16812,7 +18405,7 @@ sub get_repos_linux {
 			$key = repo_data('missing','cards');
 		}
 		else {
-			@content = url_cleaner(\@content);
+			url_cleaner(\@content);
 			$key = repo_data('active','cards');
 		}
 		push(@rows, 
@@ -16834,14 +18427,14 @@ sub get_repos_linux {
 	if (-d $xbps_dir_1 || -d $xbps_dir_2){
 		@files = main::globber("$xbps_dir_1*.conf");
 		push(@files,main::globber("$xbps_dir_2*.conf")) if -d $xbps_dir_2;
-		main::log_data('data',"xbps repo files:\n" . main::joiner(\@files, "\n", 'unset') ) if $b_log;
+		main::log_data('data',"xbps repo files:\n" . main::joiner(\@files, "\n", 'unset')) if $b_log;
 		foreach (sort @files){
 			@data = repo_builder($_,'xbps','^\s*repository\s*=','\s*=\s*',1) if -r $_;
 			push(@rows,@data);
 		}
 	}
 	# Mandriva/Mageia using: urpmq
-	if ( $path = main::check_program('urpmq') ){
+	if ($path = main::check_program('urpmq')){
 		@data2 = main::grabber("$path --list-media active --list-url","\n",'strip');
 		main::writer("$debugger_dir/system-repo-data-urpmq.txt",\@data2) if $debugger_dir;
 		# now we need to create the structure: repo info: repo path
@@ -16863,7 +18456,7 @@ sub get_repos_linux {
 			if (/(.+)\s([\S]+:\/\/.+)/){
 				# pack the repo url
 				push(@content, $1);
-				@content = url_cleaner(\@content);
+				url_cleaner(\@content);
 				# get the repo
 				$repo = $2;
 				push(@rows, 
@@ -16875,13 +18468,13 @@ sub get_repos_linux {
 		}
 	}
 	# Pardus/Solus
-	if ( (-d $pisi_dir && ( $path = main::check_program('pisi') ) ) || 
-	        (-d $eopkg_dir && ( $path = main::check_program('eopkg') ) ) ){
+	if ((-d $pisi_dir && ($path = main::check_program('pisi'))) || 
+	 (-d $eopkg_dir && ($path = main::check_program('eopkg')))){
 		#$path = 'eopkg';
 		my $which = ($path =~ /pisi$/) ? 'pisi': 'eopkg';
 		my $cmd = ($which eq 'pisi') ? "$path list-repo": "$path lr";
-		#my $file = "$ENV{HOME}/bin/scripts/inxi/data/repo/solus/eopkg-2.txt";
-		#@data2 = main::reader($file,'strip');
+		# my $file = "$ENV{HOME}/bin/scripts/inxi/data/repo/solus/eopkg-2.txt";
+		# @data2 = main::reader($file,'strip');
 		@data2 = main::grabber("$cmd 2>/dev/null","\n",'strip');
 		main::writer("$debugger_dir/system-repo-data-$which.txt",\@data2) if $debugger_dir;
 		# now we need to create the structure: repo info: repo path
@@ -16904,12 +18497,12 @@ sub get_repos_linux {
 				push(@content, $_) if $repo;
 			}
 			# Local [inactive] Unstable [active]
-			elsif ( /^(.*)\s\[([\S]+)\]/){
+			elsif (/^(.*)\s\[([\S]+)\]/){
 				$repo = $1;
 				$repo = ($2 =~ /^activ/i) ? $repo : '';
 			}
 			if ($repo && @content){
-				@content = url_cleaner(\@content);
+				url_cleaner(\@content);
 				$key = repo_data('active',$which);
 				push(@rows, 
 				{main::key($num++,1,1,$key) => $repo},
@@ -16921,7 +18514,7 @@ sub get_repos_linux {
 		}
 		# last one if present
 		if ($repo && @content){
-			@content = url_cleaner(\@content);
+			url_cleaner(\@content);
 			$key = repo_data('active',$which);
 			push(@rows, 
 			{main::key($num++,1,1,$key) => $repo},
@@ -16929,6 +18522,24 @@ sub get_repos_linux {
 			);
 		}
 	}
+	if (-f $nix && ($path = main::check_program('nix-channel'))){
+		@content = main::grabber("$path --list 2>/dev/null","\n",'strip');
+		main::writer("$debugger_dir/system-repo-data-nix.txt",\@content) if $debugger_dir;
+		if (!@content){
+			$key = repo_data('missing','nix');
+		}
+		else {
+			url_cleaner(\@content);
+			$key = repo_data('active','nix');
+		}
+		my $user = ($ENV{'USER'}) ? $ENV{'USER'}: 'N/A';
+		push(@rows, 
+		{main::key($num++,1,1,$key) => $user},
+		[@content],
+		);
+		@content = ();
+		
+	}
 	# print Dumper \@rows;
 	eval $end if $b_log;
 	return @rows;
@@ -16940,26 +18551,28 @@ sub get_repos_bsd {
 	my $bsd_pkg = '/usr/local/etc/pkg/repos/';
 	my $freebsd = '/etc/freebsd-update.conf';
 	my $freebsd_pkg = '/etc/pkg/FreeBSD.conf';
+	my $ghostbsd_pkg = '/etc/pkg/GhostBSD.conf';
+	my $hardenedbsd_pkg = '/etc/pkg/HardenedBSD.conf';
+	my $mports = '/usr/mports/Makefile';
 	my $netbsd = '/usr/pkg/etc/pkgin/repositories.conf';
 	my $openbsd = '/etc/pkg.conf';
 	my $openbsd2 = '/etc/installurl';
 	my $portsnap =  '/etc/portsnap.conf';
-	if ( -f $portsnap || -f $freebsd || -d $bsd_pkg){
-		if ( -f $portsnap ) {
+	if (-f $portsnap || -f $freebsd || -d $bsd_pkg || 
+	 -f $ghostbsd_pkg || -f $hardenedbsd_pkg){
+		if (-f $portsnap){
 			@data = repo_builder($portsnap,'portsnap','^\s*SERVERNAME','\s*=\s*',1);
 			push(@rows,@data);
 		}
-		if ( -f $freebsd ){
+		if (-f $freebsd){
 			@data = repo_builder($freebsd,'freebsd','^\s*ServerName','\s+',1);
 			push(@rows,@data);
 		}
-# 		if ( -f $freebsd_pkg ){
-# 			@data = repo_builder($freebsd_pkg,'freebsd-pkg','^\s*url',':\s+',1);
-# 			push(@rows,@data);
-# 		}
-		if ( -d $bsd_pkg || -f $freebsd_pkg){
+		if (-d $bsd_pkg || -f $freebsd_pkg || -f $ghostbsd_pkg || -f $hardenedbsd_pkg){
 			@files = main::globber('/usr/local/etc/pkg/repos/*.conf');
 			push(@files, $freebsd_pkg) if -f $freebsd_pkg;
+			push(@files, $ghostbsd_pkg) if -f $ghostbsd_pkg;
+			push(@files, $hardenedbsd_pkg) if -f $hardenedbsd_pkg;
 			if (@files){
 				my ($url);
 				foreach (@files){
@@ -16979,20 +18592,20 @@ sub get_repos_bsd {
 								$url = "$data2[1]:$data2[2]";
 								$url =~ s/"|,//g;
 							}
-							#print "url:$url\n" if $url;
+							# print "url:$url\n" if $url;
 							if ($data2[0] eq 'enabled'){
-								if ($url && $data2[1] eq 'yes'){
+								if ($url && $data2[1] =~ /^(1|true|yes)$/i){
 									push(@data3, "$url");
 								}
 								$url = '';
 							}
 						}
 					}
-					if (! @data3){
+					if (!@data3){
 						$key = repo_data('missing','bsd-package');
 					}
 					else {
-						@data3 = url_cleaner(\@data3);
+						url_cleaner(\@data3);
 						$key = repo_data('active','bsd-package');
 					}
 					push(@rows, 
@@ -17004,7 +18617,7 @@ sub get_repos_bsd {
 			}
 		}
 	}
-	elsif (-f $openbsd || -f $openbsd2) {
+	if (-f $openbsd || -f $openbsd2){
 		if (-f $openbsd){
 			@data = repo_builder($openbsd,'openbsd','^installpath','\s*=\s*',1);
 			push(@rows,@data);
@@ -17014,11 +18627,37 @@ sub get_repos_bsd {
 			push(@rows,@data);
 		}
 	}
-	elsif (-f $netbsd){
+	if (-f $netbsd){
 		# not an empty row, and not a row starting with #
 		@data = repo_builder($netbsd,'netbsd','^\s*[^#]+$');
 		push(@rows,@data);
 	}
+	# I don't think this is right, have to find out, for midnightbsd
+# 	if (-f $mports){
+# 		@data = main::reader($mports,'strip');
+# 		main::writer("$debugger_dir/system-repo-data-mports.txt",\@data) if $debugger_dir;
+# 		for (@data){
+# 			if (!/^MASTER_SITE_INDEX/){
+# 				next;
+# 			}
+# 			else {
+# 				push(@data3,(split(/=\s*/,$_))[1]);
+# 			}
+# 			last if /^INDEX/;
+# 		}
+# 		if (!@data3){
+# 			$key = repo_data('missing','mports');
+# 		}
+# 		else {
+# 			url_cleaner(\@data3);
+# 			$key = repo_data('active','mports');
+# 		}
+# 		push(@rows, 
+# 		{main::key($num++,1,1,$key) => $mports},
+# 		[@data3],
+# 		);
+# 		@data3 = ();
+# 	}
 	# BSDs do not default always to having repo files, so show correct error 
 	# mesage in that case
 	if (!@rows){
@@ -17050,11 +18689,13 @@ sub repo_data {
 	'apk-missing' => 'No active APK repos in',
 	'apt-active' => 'Active apt repos in',
 	'apt-missing' => 'No active apt repos in',
-	'bsd-files-missing' => 'No BSD pkg server files found',
-	'bsd-package-active' => 'BSD enabled pkg servers in',
+	'bsd-files-missing' => 'No pkg server files found',
+	'bsd-package-active' => 'Enabled pkg servers in',
 	'bsd-package-missing' => 'No enabled BSD pkg servers in',
 	'cards-active' => 'Active CARDS collections in',
 	'cards-missing' => 'No active CARDS collections in',
+	'dnf-active' => 'Active dnf repos in',
+	'dnf-missing' => 'No active dnf repos in',
 	'eopkg-active' => 'Active eopkg repo',
 	'eopkg-missing' => 'No active eopkg repos found',
 	'files-missing' => 'No repo files found in',
@@ -17063,9 +18704,13 @@ sub repo_data {
 	'freebsd-missing' => 'No FreeBSD update servers in',
 	'freebsd-pkg-active' => 'FreeBSD default pkg server',
 	'freebsd-pkg-missing' => 'No FreeBSD default pkg server in',
+	'mports-active' => 'mports servers',
+	'mports-missing' => 'No mports servers found',
 	'netbsd-active' => 'NetBSD pkg servers',
 	'netbsd-files-missing' => 'No NetBSD pkg server files found',
 	'netbsd-missing' => 'No NetBSD pkg servers in',
+	'nix-active' => 'Active nix channels for user',
+	'nix-missing' => 'No nix channels found for user',
 	'openbsd-active' => 'OpenBSD pkg mirror',
 	'openbsd-files-missing' => 'No OpenBSD pkg mirror files found',
 	'openbsd-missing' => 'No OpenBSD pkg mirrors in',
@@ -17077,8 +18722,10 @@ sub repo_data {
 	'pisi-missing' => 'No active pisi repos found',
 	'portage-active' => 'Enabled portage sources in',
 	'portage-missing' => 'No enabled portage sources in',
-	'portsnap-active' => 'BSD ports server',
+	'portsnap-active' => 'Ports server',
 	'portsnap-missing' => 'No ports servers in',
+	'scratchpkg-active' => 'scratchpkg repos in',
+	'scratchpkg-missing' => 'No active scratchpkg repos in',
 	'slackpkg-active' => 'slackpkg repos in',
 	'slackpkg-missing' => 'No active slackpkg repos in',
 	'slackpkg+-active' => 'slackpkg+ repos in',
@@ -17105,7 +18752,7 @@ sub repo_builder {
 	if (-r $file){
 		@content =  main::reader($file);
 		@content = grep {/$search/i && !/^\s*$/} @content if @content;
-		@content = data_cleaner(\@content) if @content;
+		data_cleaner(\@content) if @content;
 	}
 	if ($split && @content){
 		@content = map { 
@@ -17118,7 +18765,7 @@ sub repo_builder {
 	}
 	else {
 		$key = repo_data('active',$type);
-		@content = url_cleaner(\@content);
+		url_cleaner(\@content);
 	}
 	@data = (
 	{main::key($num++,1,1,$key) => $file},
@@ -17128,16 +18775,12 @@ sub repo_builder {
 	return @data;
 }
 sub data_cleaner {
-	my ($content) = @_;
 	# basics: trim white space, get rid of double spaces
-	@$content = map { $_ =~ s/^\s+|\s+$//g; $_ =~ s/\s\s+/ /g; $_} @$content;
-	return @$content;
+	@{$_[0]} = map {$_ =~ s/^\s+|\s+$//g; $_ =~ s/\s\s+/ /g; $_} @{$_[0]};
 }
 # clean if irc
 sub url_cleaner {
-	my ($content) = @_;
-	@$content = map { $_ =~ s/:\//: \//; $_} @$content if $b_irc;
-	return @$content;
+	@{$_[0]} = map {$_ =~ s/:\//: \//; $_} @{$_[0]} if $b_irc;
 }
 sub file_path {
 	my ($filename,$dir) = @_;
@@ -17150,10 +18793,9 @@ sub file_path {
 }
 }
 
-## SensorData
+## SensorItem
 {
-package SensorData;
-my ($b_ipmi) = (0);
+package SensorItem;
 sub get {
 	eval $start if $b_log;
 	my ($key1,$program,$val1,@data,@rows,%sensors);
@@ -17161,17 +18803,16 @@ sub get {
 	my $source = 'sensors';
 	# we're allowing 1 or 2 ipmi tools, first the gnu one, then the 
 	# almost certain to be present in BSDs
-	if ( $b_ipmi || 
-	    ( main::globber('/dev/ipmi**') && 
-	    ( ( $program = main::check_program('ipmi-sensors') ) ||
-	    ( $program = main::check_program('ipmitool') ) ) ) ){
-		if ($b_ipmi || $b_root){
+	if ($fake{'ipmi'} || (main::globber('/dev/ipmi**') && 
+	    (($program = main::check_program('ipmi-sensors')) ||
+	     ($program = main::check_program('ipmitool'))))){
+		if ($fake{'ipmi'} || $b_root){
 			%sensors = ipmi_data($program);
 			@data = sensors_output('ipmi',\%sensors);
-			if (!@data) {
+			if (!@data){
 				$key1 = 'Message';
 				$val1 = main::row_defaults('sensors-data-ipmi');
-				#$val1 = main::row_defaults('dev');
+				# $val1 = main::row_defaults('dev');
 				@data = ({main::key($num++,0,1,$key1) => $val1,});
 			}
 			push(@rows,@data);
@@ -17184,24 +18825,42 @@ sub get {
 			push(@rows,@data);
 		}
 	}
-	if ( $alerts{'sensors'}->{'action'} ne 'use'){
-		#print "here 1\n";
-		$key1 = $alerts{'sensors'}->{'action'};
-		$val1 = $alerts{'sensors'}->{$key1};
-		$key1 = ucfirst($key1);
-		@data = ({main::key($num++,0,1,$key1) => $val1,});
+	if ($sysctl{'sensor'}){
+		%sensors = sysctl_data();
+		@data = sensors_output('sysctl-sensors',\%sensors);
+		if (!@data){
+			$key1 = 'Message';
+			$val1 = main::row_defaults('sensors-data-bsd',$uname[0]);
+			@data = ({main::key($num++,0,1,$key1) => $val1,});
+		}
 		push(@rows,@data);
 	}
 	else {
-		%sensors = lm_sensors_data();
-		@data = sensors_output($source,\%sensors);
-		#print "here 2\n";
-		if (!@data) {
-			$key1 = 'Message';
-			$val1 = main::row_defaults('sensors-data-linux');
+		if (!$fake{'sensors'} && $alerts{'sensors'}->{'action'} ne 'use'){
+			# print "here 1\n";
+			if ($bsd_type && $bsd_type =~ /^(free|open)bsd/){
+				$key1 = 'Message';
+				$val1 = main::row_defaults('sensors-data-bsd-ok');
+			}
+			else {
+				$key1 = $alerts{'sensors'}->{'action'};
+				$val1 = $alerts{'sensors'}->{'message'};
+				$key1 = ucfirst($key1);
+			}
 			@data = ({main::key($num++,0,1,$key1) => $val1,});
+			push(@rows,@data);
+		}
+		else {
+			%sensors = lm_sensors_data();
+			@data = sensors_output($source,\%sensors);
+			# print "here 2\n";
+			if (!@data){
+				$key1 = 'Message';
+				$val1 = main::row_defaults('sensors-data-linux');
+				@data = ({main::key($num++,0,1,$key1) => $val1,});
+			}
+			push(@rows,@data);
 		}
-		push(@rows,@data);
 	}
 	eval $end if $b_log;
 	return @rows;
@@ -17216,7 +18875,7 @@ sub sensors_output {
 	my $fan_number = 0;
 	my $num = 0;
 	my $j = 0;
-	@gpu = gpu_data() if ( $source eq 'sensors' || $source eq 'lm-sensors' );
+	@gpu = gpu_data() if ($source eq 'sensors' || $source eq 'lm-sensors');
 	my $temp_unit  = (defined $sensors->{'temp-unit'}) ? " $sensors->{'temp-unit'}": '';
 	my $cpu_temp = (defined $sensors->{'cpu-temp'}) ? $sensors->{'cpu-temp'} . $temp_unit: 'N/A';
 	my $mobo_temp = (defined $sensors->{'mobo-temp'}) ? $sensors->{'mobo-temp'} . $temp_unit: 'N/A';
@@ -17251,7 +18910,7 @@ sub sensors_output {
 	if (scalar @gpu == 1 && defined $gpu[0]->{'temp'}){
 		my $gpu_temp = $gpu[0]->{'temp'};
 		my $gpu_type = $gpu[0]->{'type'};
-		my $gpu_unit = (defined $gpu[0]{'temp-unit'} && $gpu_temp ) ? " $gpu[0]->{'temp-unit'}" : ' C';
+		my $gpu_unit = (defined $gpu[0]{'temp-unit'} && $gpu_temp) ? " $gpu[0]->{'temp-unit'}" : ' C';
 		$rows[$j]->{main::key($num++,1,2,'gpu')} = $gpu_type;
 		$rows[$j]->{main::key($num++,0,3,'temp')} = $gpu_temp . $gpu_unit;
 		if ($extra > 1 && $gpu[0]->{'temp-mem'}){
@@ -17270,7 +18929,7 @@ sub sensors_output {
 	for (my $i = 0; $i < scalar @fan_main; $i++){
 		next if $i == 0;# starts at 1, not 0
 		if (defined $fan_main[$i]){
-			if ($i == 1 || ($i == 2 && !$b_cpu )){
+			if ($i == 1 || ($i == 2 && !$b_cpu)){
 				$rows[$j]->{main::key($num++,0,2,'cpu')} = $fan_main[$i];
 				$b_cpu = 1;
 			}
@@ -17308,14 +18967,14 @@ sub sensors_output {
 	if (scalar @gpu > 1){
 		$j = scalar @rows;
 		$rows[$j]->{main::key($num++,1,1,'GPU')} = '';
-		my $gpu_unit = (defined $gpu[0]->{'temp-unit'} ) ? " $gpu[0]->{'temp-unit'}" : ' C';
+		my $gpu_unit = (defined $gpu[0]->{'temp-unit'}) ? " $gpu[0]->{'temp-unit'}" : ' C';
 		foreach my $info (@gpu){
 			# speed unit is either '' or %
 			my $gpu_fan = (defined $info->{'fan-speed'}) ? $info->{'fan-speed'} . $info->{'speed-unit'}: undef ;
 			my $gpu_type = $info->{'type'};
-			my $gpu_temp = (defined $info->{'temp'} ) ? $info->{'temp'} . $gpu_unit: 'N/A';
+			my $gpu_temp = (defined $info->{'temp'}) ? $info->{'temp'} . $gpu_unit: 'N/A';
 			$rows[$j]->{main::key($num++,1,2,'device')} = $gpu_type;
-			if (defined $info->{'screen'} ){
+			if (defined $info->{'screen'}){
 				$rows[$j]->{main::key($num++,0,3,'screen')} = $info->{'screen'};
 			}
 			$rows[$j]->{main::key($num++,0,3,'temp')} = $gpu_temp;
@@ -17345,7 +19004,7 @@ sub sensors_output {
 		$rows[$j]->{main::key($num++,0,2,'5v')} = $sensors->{'volts-5'};
 		$rows[$j]->{main::key($num++,0,2,'3.3v')} = $sensors->{'volts-3.3'};
 		$rows[$j]->{main::key($num++,0,2,'vbat')} = $sensors->{'volts-vbat'};
-		if ($extra > 1 && $source eq 'ipmi' ){
+		if ($extra > 1 && $source eq 'ipmi'){
 			$sensors->{'volts-dimm-p1'} ||= 'N/A';
 			$sensors->{'volts-dimm-p2'} ||= 'N/A';
 			$rows[$j]->{main::key($num++,0,2,'dimm-p1')} = $sensors->{'volts-dimm-p1'} if $sensors->{'volts-dimm-p1'};
@@ -17367,40 +19026,49 @@ sub ipmi_data {
 	my ($program) = @_;
 	my ($b_cpu_0,$cmd,$file,@data,$fan_working,%sensors,@row,$sys_fan_nu,
 	$temp_working,$working_unit);
-	$program ||= 'ipmi-sensors'; # only for debugging, will always exist if reaches here
 	my ($b_ipmitool,$i_key,$i_value,$i_unit);
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-archerseven-1.txt";$program='ipmitool';
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-crazy-epyc-1.txt";$program='ipmitool';
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-RK016013.txt";$program='ipmitool';
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-crazy-epyc-1.txt";
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-lathander.txt";
-	#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-zwerg.txt";
-	#@data = main::reader($file);
-	if ($program =~ /ipmi-sensors$/){
-		$cmd = $program;
-		($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4);
+	if ($fake{'ipmi'}){
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-archerseven-1.txt";$program='ipmitool';
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-crazy-epyc-1.txt";$program='ipmitool';
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-RK016013.txt";$program='ipmitool';
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmitool-sensors-freebsd-offsite-backup.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-crazy-epyc-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-lathander.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-zwerg.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ipmitool/ipmi-sensors-arm-server-1.txt";
+		# @data = main::reader($file);
+		#($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4); # ipmi-sensors
+		#($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2); # ipmitool sensors
 	}
 	else {
-		$cmd = "$program sensors";
-		($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2);
+		if ($program =~ /ipmi-sensors$/){
+			$cmd = $program;
+			($b_ipmitool,$i_key,$i_value,$i_unit) = (0,1,3,4);
+		}
+		else { # ipmitool
+			$cmd = "$program sensors";
+			($b_ipmitool,$i_key,$i_value,$i_unit) = (1,0,1,2);
+		}
+		@data = main::grabber("$cmd 2>/dev/null");
 	}
-	@data = main::grabber("$cmd 2>/dev/null");
 	# print join("\n", @data), "\n";
-	return if ! @data;
+	# shouldn't need to log, but saw a case with debugger ipmi data, but none here apparently
+	main::log_data('dump','ipmi @data',\@data) if $b_log;
+	return if !@data;
 	foreach (@data){
 		next if /^\s*$/;
 		# print "$_\n";
 		@row = split(/\s*\|\s*/, $_);
-		#print "$row[$i_value]\n";
+		# print "$row[$i_value]\n";
 		next if !main::is_numeric($row[$i_value]);
 		# print "$row[$i_key] - $row[$i_value]\n";
-		if (!$sensors{'mobo-temp'} && $row[$i_key] =~ /^(MB_TEMP[0-9]|System[\s_]Temp|System[\s_]?Board)$/i){
+		if (!$sensors{'mobo-temp'} && $row[$i_key] =~ /^(MB_TEMP[0-9]|System[\s_]Temp|System[\s_]?Board([\s_]Temp)?)$/i){
 			$sensors{'mobo-temp'} = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
-		elsif ($row[$i_key] =~ /^(Ambient)$/i){
+		elsif ($row[$i_key] =~ /^(Ambient)([\s_]Temp)?$/i){
 			$sensors{'ambient-temp'} = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
@@ -17409,14 +19077,14 @@ sub ipmi_data {
 		# Platform Control Hub (PCH), it is the X370 chip on the Crosshair VI Hero.
 		# VRM: voltage regulator module
 		# NOTE: CPU0_TEMP CPU1_TEMP is possible, unfortunately; CPU Temp Interf 
-		elsif ( !$sensors{'cpu-temp'} && $row[$i_key] =~ /^CPU([01])?([\s_]Temp)?$/i) {
+		elsif (!$sensors{'cpu-temp'} && $row[$i_key] =~ /^CPU([01])?([\s_]Temp)?$/i){
 			$b_cpu_0 = 1 if defined $1 && $1 == 0;
 			$sensors{'cpu-temp'} = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
-		elsif ($row[$i_key] =~ /^CPU([1-4])([\s_]Temp)?$/i) {
+		elsif ($row[$i_key] =~ /^CPU([1-4])([\s_]Temp)?$/i){
 			$temp_working = $1;
 			$temp_working++ if $b_cpu_0;
 			$sensors{"cpu${temp_working}-temp"} = int($row[$i_value]);
@@ -17425,30 +19093,30 @@ sub ipmi_data {
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
 		# for temp1/2 only use temp1/2 if they are null or greater than the last ones
-		elsif ($row[$i_key] =~ /^(MB[_]?TEMP1|Temp[\s_]1)$/i) {
+		elsif ($row[$i_key] =~ /^(MB[_]?TEMP1|Temp[\s_]1)$/i){
 			$temp_working = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
-			if ( !$sensors{'temp1'} || ( defined $temp_working && $temp_working > 0 ) ) {
+			if (!$sensors{'temp1'} || (defined $temp_working && $temp_working > 0)){
 				$sensors{'temp1'} = $temp_working;
 			}
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
-		elsif ($row[$i_key] =~ /^(MB[_]?TEMP2|Temp[\s_]2)$/i) {
+		elsif ($row[$i_key] =~ /^(MB[_]?TEMP2|Temp[\s_]2)$/i){
 			$temp_working = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
-			if ( !$sensors{'temp2'} || ( defined $temp_working && $temp_working > 0 ) ) {
+			if (!$sensors{'temp2'} || (defined $temp_working && $temp_working > 0)){
 				$sensors{'temp2'} = $temp_working;
 			}
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
 		# temp3 is only used as an absolute override for systems with all 3 present
-		elsif ($row[$i_key] =~ /^(MB[_]?TEMP3|Temp[\s_]3)$/i) {
+		elsif ($row[$i_key] =~ /^(MB[_]?TEMP3|Temp[\s_]3)$/i){
 			$temp_working = int($row[$i_value]);
 			$working_unit = $row[$i_unit];
 			$working_unit =~ s/degrees\s// if $b_ipmitool; 
-			if ( !$sensors{'temp3'} || ( defined $temp_working && $temp_working > 0 ) ) {
+			if (!$sensors{'temp3'} || (defined $temp_working && $temp_working > 0)){
 				$sensors{'temp3'} = $temp_working;
 			}
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
@@ -17460,20 +19128,20 @@ sub ipmi_data {
 			$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 		}
 		# note: can be cpu fan:, cpu fan speed:, etc.
-		elsif ($row[$i_key] =~ /^(CPU|Processor)[\s_]Fan/i) {
+		elsif ($row[$i_key] =~ /^(CPU|Processor)[\s_]Fan/i){
 			$sensors{'fan-main'}->[1] = int($row[$i_value]);
 		}
 		# note that the counters are dynamically set for fan numbers here
 		# otherwise you could overwrite eg aux fan2 with case fan2 in theory
 		# note: cpu/mobo/ps are 1/2/3
-		elsif ($row[$i_key] =~ /^(SYS[\s_])?FAN[\s_]?([0-9A-F]+)/i) {
+		elsif ($row[$i_key] =~ /^(SYS[\s_])?FAN[\s_]?([0-9A-F]+)/i){
 			$sys_fan_nu = hex($2);
 			$fan_working = int($row[$i_value]);
 			$sensors{'fan-default'} = () if !$sensors{'fan-default'};
-			if ( $sys_fan_nu =~ /^([0-9]+)$/ ) {
+			if ($sys_fan_nu =~ /^([0-9]+)$/){
 				# add to array if array index does not exist OR if number is > existing number
-				if ( defined $sensors{'fan-default'}->[$sys_fan_nu] ) {
-					if ( $fan_working >= $sensors{'fan-default'}->[$sys_fan_nu] ) {
+				if (defined $sensors{'fan-default'}->[$sys_fan_nu]){
+					if ($fan_working >= $sensors{'fan-default'}->[$sys_fan_nu]){
 						$sensors{'fan-default'}->[$sys_fan_nu] = $fan_working;
 					}
 				}
@@ -17482,48 +19150,48 @@ sub ipmi_data {
 				}
 			}
 		}
-		elsif ($row[$i_key] =~ /^(FAN PSU|PSU FAN)$/i) {
+		elsif ($row[$i_key] =~ /^(FAN PSU|PSU FAN)$/i){
 			$sensors{'fan-psu'} = int($row[$i_value]);
 		}
-		elsif ($row[$i_key] =~ /^(FAN PSU1|PSU1 FAN)$/i) {
+		elsif ($row[$i_key] =~ /^(FAN PSU1|PSU1 FAN)$/i){
 			$sensors{'fan-psu-1'} = int($row[$i_value]);
 		}
-		elsif ($row[$i_key] =~ /^(FAN PSU2|PSU2 FAN)$/i) {
+		elsif ($row[$i_key] =~ /^(FAN PSU2|PSU2 FAN)$/i){
 			$sensors{'fan-psu-2'} = int($row[$i_value]);
 		}
 		if ($extra > 0){
-			if ($row[$i_key] =~ /^(MAIN\s|P[_]?)?12V$/i) {
+			if ($row[$i_key] =~ /^((MAIN\s|P[_]?)?12V|PSU[12]_VOUT)$/i){
 				$sensors{'volts-12'} = $row[$i_value];
 			}
-			elsif ($row[$i_key] =~ /^(MAIN\s5V|P5V|5VCC|5V PG)$/i) {
+			elsif ($row[$i_key] =~ /^(MAIN\s5V|P5V|5VCC|5V PG|5V_SB)$/i){
 				$sensors{'volts-5'} = $row[$i_value];
 			}
-			elsif ($row[$i_key] =~ /^(MAIN\s3.3V|P3V3|3.3VCC|3.3V PG)$/i) {
+			elsif ($row[$i_key] =~ /^(MAIN\s3\.3V|P3V3|3\.3VCC|3\.3V PG|3V3_SB)$/i){
 				$sensors{'volts-3.3'} = $row[$i_value];
 			}
-			elsif ($row[$i_key] =~ /^((P_)?VBAT|CMOS Battery|BATT 3.0V)$/i) {
+			elsif ($row[$i_key] =~ /^((P_)?VBAT|CMOS Battery|BATT 3.0V)$/i){
 				$sensors{'volts-vbat'} = $row[$i_value];
 			}
 			# NOTE: VDimmP1ABC VDimmP1DEF
-			elsif (!$sensors{'volts-dimm-p1'} && $row[$i_key] =~ /^(P1_VMEM|VDimmP1|MEM RSR A PG)/i) {
+			elsif (!$sensors{'volts-dimm-p1'} && $row[$i_key] =~ /^(P1_VMEM|VDimmP1|MEM RSR A PG|DIMM_VR1_VOLT)/i){
 				$sensors{'volts-dimm-p1'} = $row[$i_value];
 			}
-			elsif (! $sensors{'volts-dimm-p2'} && $row[$i_key] =~ /^(P2_VMEM|VDimmP2|MEM RSR B PG)/i) {
+			elsif (!$sensors{'volts-dimm-p2'} && $row[$i_key] =~ /^(P2_VMEM|VDimmP2|MEM RSR B PG|DIMM_VR2_VOLT)/i){
 				$sensors{'volts-dimm-p2'} = $row[$i_value];
 			}
-			elsif (!$sensors{'volts-soc-p1'} && $row[$i_key] =~ /^(P1_SOC_RUN$)/i) {
+			elsif (!$sensors{'volts-soc-p1'} && $row[$i_key] =~ /^(P1_SOC_RUN$)/i){
 				$sensors{'volts-soc-p1'} = $row[$i_value];
 			}
-			elsif (! $sensors{'volts-soc-p2'} && $row[$i_key] =~ /^(P2_SOC_RUN$)/i) {
+			elsif (!$sensors{'volts-soc-p2'} && $row[$i_key] =~ /^(P2_SOC_RUN$)/i){
 				$sensors{'volts-soc-p2'} = $row[$i_value];
 			}
 		}
 	}
-	# print Data::Dumper::Dumper \%sensors;
+	print Data::Dumper::Dumper \%sensors if $dbg[31];
 	%sensors = process_data(%sensors) if %sensors;
 	main::log_data('dump','ipmi: %sensors',\%sensors) if $b_log;
 	eval $end if $b_log;
-	# print Data::Dumper::Dumper \%sensors;
+	print Data::Dumper::Dumper \%sensors if $dbg[31];
 	return %sensors;
 }
 sub lm_sensors_data {
@@ -17531,7 +19199,7 @@ sub lm_sensors_data {
 	my (%sensors);
 	my ($sys_fan_nu)  = (0);
 	my ($adapter,$fan_working,$temp_working,$working_unit)  = ('','','','','');
-	process_lm_sensors() if !$b_sensors;
+	process_lm_sensors() if !$loaded{'lm-sensors'};
 	foreach $adapter (keys %{$sensors_raw{'main'}}){
 		next if !$adapter || ref $sensors_raw{'main'}->{$adapter} ne 'ARRAY';
 		# not sure why hwmon is excluded, forgot to add info in comments
@@ -17542,7 +19210,7 @@ sub lm_sensors_data {
 		foreach (@{$sensors_raw{'main'}->{$adapter}}){
 			my @working = split(':', $_);
 			next if !$working[0];
-			#print "$working[0]:$working[1]\n";
+			# print "$working[0]:$working[1]\n";
 			# There are some guesses here, but with more sensors samples it will get closer.
 			# note: using arrays starting at 1 for all fan arrays to make it easier overall
 			# we have to be sure we are working with the actual real string before assigning
@@ -17551,9 +19219,9 @@ sub lm_sensors_data {
 			# note that because of charset issues, no "°" degree sign used, but it is required 
 			# in testing regex to avoid error. It might be because I got that data from a forum post,
 			# note directly via debugger.
-			if ($_ =~ /^T?(AMBIENT|M\/B|MB|Motherboard|SIO|SYS).*:([0-9\.]+)[\s°]*(C|F)/i) {
+			if ($_ =~ /^T?(AMBIENT|M\/B|MB|Motherboard|SIO|SYS).*:([0-9\.]+)[\s°]*(C|F)/i){
 				# avoid SYSTIN: 118 C
-				if (main::is_numeric($2) && $2 < 90 ){
+				if (main::is_numeric($2) && $2 < 90){
 					$sensors{'mobo-temp'} = $2;
 					$working_unit = $3;
 					$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
@@ -17567,107 +19235,107 @@ sub lm_sensors_data {
 			# NOTE: I've seen an inexplicable case where: CPU:52.0°C fails to match with [\s°] but 
 			# does match with: [\s°]*. I can't account for this, but that's why the * is there
 			# Tdie is a new k10temp-pci syntax for cpu die temp
-			elsif ($_ =~ /^(T?CPU.*|Tdie.*):([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^(T?CPU.*|Tdie.*):([0-9\.]+)[\s°]*(C|F)/i){
 				$temp_working = $2;
 				$working_unit = $3;
-				if ( !$sensors{'cpu-temp'} || 
-					( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'cpu-temp'} ) ) {
+				if (!$sensors{'cpu-temp'} || 
+				 (defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'cpu-temp'})){
 					$sensors{'cpu-temp'} = $temp_working;
 				}
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
-			elsif ($_ =~ /^PECI\sAgent\s0.*:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^PECI\sAgent\s0.*:([0-9\.]+)[\s°]*(C|F)/i){
 				$sensors{'cpu-peci-temp'} = $1;
 				$working_unit = $2;
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
-			elsif ($_ =~ /^T?(P\/S|Power).*:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^T?(P\/S|Power).*:([0-9\.]+)[\s°]*(C|F)/i){
 				$sensors{'psu-temp'} = $2;
 				$working_unit = $3;
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
-			elsif ($_ =~ /^T?(dimm|mem|sodimm).*:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^T?(dimm|mem|sodimm).*:([0-9\.]+)[\s°]*(C|F)/i){
 				$sensors{'sodimm-temp'} = $1;
 				$working_unit = $2;
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
 			# for temp1/2 only use temp1/2 if they are null or greater than the last ones
-			elsif ($_ =~ /^temp1:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^temp1:([0-9\.]+)[\s°]*(C|F)/i){
 				$temp_working = $1;
 				$working_unit = $2;
-				if ( !$sensors{'temp1'} || 
-					( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp1'} ) ) {
+				if (!$sensors{'temp1'} || 
+				 (defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp1'})){
 					$sensors{'temp1'} = $temp_working;
 				}
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
-			elsif ($_ =~ /^temp2:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^temp2:([0-9\.]+)[\s°]*(C|F)/i){
 				$temp_working = $1;
 				$working_unit = $2;
-				if ( !$sensors{'temp2'} || 
-					( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp2'} ) ) {
+				if (!$sensors{'temp2'} || 
+				 (defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp2'})){
 					$sensors{'temp2'} = $temp_working;
 				}
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
 			# temp3 is only used as an absolute override for systems with all 3 present
-			elsif ($_ =~ /^temp3:([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^temp3:([0-9\.]+)[\s°]*(C|F)/i){
 				$temp_working = $1;
 				$working_unit = $2;
-				if ( !$sensors{'temp3'} || 
-					( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp3'} ) ) {
+				if (!$sensors{'temp3'} || 
+				 (defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'temp3'})){
 					$sensors{'temp3'} = $temp_working;
 				}
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
 			# final fallback if all else fails, funtoo user showed sensors putting
 			# temp on wrapped second line, not handled
-			elsif ($_ =~ /^T?(core0|core 0|Physical id 0)(.*):([0-9\.]+)[\s°]*(C|F)/i) {
+			elsif ($_ =~ /^T?(core0|core 0|Physical id 0)(.*):([0-9\.]+)[\s°]*(C|F)/i){
 				$temp_working = $3;
 				$working_unit = $4;
-				if ( !$sensors{'core-0-temp'} || 
-					( defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'core-0-temp'} ) ) {
+				if (!$sensors{'core-0-temp'} || 
+				 (defined $temp_working && $temp_working > 0 && $temp_working > $sensors{'core-0-temp'})){
 					$sensors{'core-0-temp'} = $temp_working;
 				}
 				$sensors{'temp-unit'} = set_temp_unit($sensors{'temp-unit'},$working_unit) if $working_unit;
 			}
 			# note: can be cpu fan:, cpu fan speed:, etc.
-			elsif (!$sensors{'fan-main'}->[1] && $_ =~ /^F?(CPU|Processor).*:([0-9]+)[\s]RPM/i) {
+			elsif (!$sensors{'fan-main'}->[1] && $_ =~ /^F?(CPU|Processor).*:([0-9]+)[\s]RPM/i){
 				$sensors{'fan-main'}->[1] = $2;
 			}
-			elsif (!$sensors{'fan-main'}->[2] && $_ =~ /^F?(M\/B|MB|SYS|Motherboard).*:([0-9]+)[\s]RPM/i) {
+			elsif (!$sensors{'fan-main'}->[2] && $_ =~ /^F?(M\/B|MB|SYS|Motherboard).*:([0-9]+)[\s]RPM/i){
 				$sensors{'fan-main'}->[2] = $2;
 			}
-			elsif (!$sensors{'fan-main'}->[3] && $_ =~ /F?(Power|P\/S|POWER).*:([0-9]+)[\s]RPM/i) {
+			elsif (!$sensors{'fan-main'}->[3] && $_ =~ /F?(Power|P\/S|POWER).*:([0-9]+)[\s]RPM/i){
 				$sensors{'fan-main'}->[3] = $2;
 			}
-			elsif (!$sensors{'fan-main'}->[4] && $_ =~ /F?(dimm|mem|sodimm).*:([0-9]+)[\s]RPM/i) {
+			elsif (!$sensors{'fan-main'}->[4] && $_ =~ /F?(dimm|mem|sodimm).*:([0-9]+)[\s]RPM/i){
 				$sensors{'fan-main'}->[4] = $2;
 			}
 			# note that the counters are dynamically set for fan numbers here
 			# otherwise you could overwrite eg aux fan2 with case fan2 in theory
 			# note: cpu/mobo/ps/sodimm are 1/2/3/4
-			elsif ($_ =~ /^F?(AUX|CASE|CHASSIS|FRONT|REAR).*:([0-9]+)[\s]RPM/i) {
+			elsif ($_ =~ /^F?(AUX|CASE|CHASSIS|FRONT|REAR).*:([0-9]+)[\s]RPM/i){
 				$temp_working = $2;
-				for ( my $i = 5; $i < 30; $i++ ){
+				for (my $i = 5; $i < 30; $i++){
 					next if defined $sensors{'fan-main'}->[$i];
-					if ( !defined $sensors{'fan-main'}->[$i] ){
+					if (!defined $sensors{'fan-main'}->[$i]){
 						$sensors{'fan-main'}->[$i] = $temp_working;
 						last;
 					}
 				}
 			}
 			# in rare cases syntax is like: fan1: xxx RPM
-			elsif ($_ =~ /^FAN(1)?:([0-9]+)[\s]RPM/i) {
+			elsif ($_ =~ /^FAN(1)?:([0-9]+)[\s]RPM/i){
 				$sensors{'fan-default'}->[1] = $2;
 			}
-			elsif ($_ =~ /^FAN([2-9]|1[0-9]).*:([0-9]+)[\s]RPM/i) {
+			elsif ($_ =~ /^FAN([2-9]|1[0-9]).*:([0-9]+)[\s]RPM/i){
 				$fan_working = $2;
 				$sys_fan_nu = $1;
-				if ( $sys_fan_nu =~ /^([0-9]+)$/ ) {
+				if ($sys_fan_nu =~ /^([0-9]+)$/){
 					# add to array if array index does not exist OR if number is > existing number
-					if ( defined $sensors{'fan-default'}->[$sys_fan_nu] ) {
-						if ( $fan_working >= $sensors{'fan-default'}->[$sys_fan_nu] ) {
+					if (defined $sensors{'fan-default'}->[$sys_fan_nu]){
+						if ($fan_working >= $sensors{'fan-default'}->[$sys_fan_nu]){
 							$sensors{'fan-default'}->[$sys_fan_nu] = $fan_working;
 						}
 					}
@@ -17677,29 +19345,29 @@ sub lm_sensors_data {
 				}
 			}
 			if ($extra > 0){
-				if ($_ =~ /^[+]?(12 Volt|12V|V\+?12).*:([0-9\.]+)\sV/i) {
+				if ($_ =~ /^[+]?(12 Volt|12V|V\+?12).*:([0-9\.]+)\sV/i){
 					$sensors{'volts-12'} = $2;
 				}
 				# note: 5VSB is a field name
-				elsif ($_ =~ /^[+]?(5 Volt|5V|V\+?5):([0-9\.]+)\sV/i) {
+				elsif ($_ =~ /^[+]?(5 Volt|5V|V\+?5):([0-9\.]+)\sV/i){
 					$sensors{'volts-5'} = $2;
 				}
-				elsif ($_ =~ /^[+]?(3\.3 Volt|3\.3V|V\+?3\.3).*:([0-9\.]+)\sV/i) {
+				elsif ($_ =~ /^[+]?(3\.3 Volt|3\.3V|V\+?3\.3).*:([0-9\.]+)\sV/i){
 					$sensors{'volts-3.3'} = $2;
 				}
-				elsif ($_ =~ /^(Vbat).*:([0-9\.]+)\sV/i) {
+				elsif ($_ =~ /^(Vbat).*:([0-9\.]+)\sV/i){
 					$sensors{'volts-vbat'} = $2;
 				}
-				elsif ($_ =~ /^v(dimm|mem|sodimm).*:([0-9\.]+)\sV/i) {
+				elsif ($_ =~ /^v(dimm|mem|sodimm).*:([0-9\.]+)\sV/i){
 					$sensors{'volts-mem'} = $2;
 				}
 			}
 		}
 	}
-	# print Data::Dumper::Dumper \%sensors;
+	print Data::Dumper::Dumper \%sensors if $dbg[31];
 	%sensors = process_data(%sensors) if %sensors;
 	main::log_data('dump','lm-sensors: %sensors',\%sensors) if $b_log;
-	# print Data::Dumper::Dumper \%sensors;
+	print Data::Dumper::Dumper \%sensors if $dbg[31];
 	eval $end if $b_log;
 	return %sensors;
 }
@@ -17707,14 +19375,14 @@ sub process_lm_sensors {
 	eval $start if $b_log;
 	my (@data,@sensors_data,@values);
 	my ($adapter,$holder,$type) = ('','','');
-	if ($b_fake_sensors){
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/amdgpu-w-fan-speed-stretch-k10.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/peci-tin-geggo.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-w-other-biker.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-asus-chassis-1.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-devnull-1.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-jammin1.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-mx-incorrect-1.txt";
+	if ($fake{'sensors'}){
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/amdgpu-w-fan-speed-stretch-k10.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/peci-tin-geggo.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-w-other-biker.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-asus-chassis-1.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-devnull-1.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-jammin1.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-mx-incorrect-1.txt";
 		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-maximus-arch-1.txt";
 		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/kernel-58-sensors-ant-1.txt";
 		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sensors/sensors-zenpower-nvme-2.txt";
@@ -17729,9 +19397,9 @@ sub process_lm_sensors {
 		@sensors_data = map {$_ =~ s/\s*:\s*\+?/:/;$_} @sensors_data;
 		push(@sensors_data, 'END');
 	}
-	#print Data::Dumper::Dumper \@sensors_data;
+	# print Data::Dumper::Dumper \@sensors_data;
 	foreach (@sensors_data){
-		#print 'st:', $_, "\n";
+		# print 'st:', $_, "\n";
 		next if /^\s*$/;
 		$_ = main::trimmer($_);
 		if (@values && $adapter && (/^Adapter/ || $_ eq 'END')){
@@ -17766,8 +19434,8 @@ sub process_lm_sensors {
 			$holder = $_;
 		}
 	}
-	$b_sensors = 1;
-	if ($test[18]){
+	$loaded{'lm-sensors'} = 1;
+	if ($dbg[18]){
 		print 'lm sensors: ' , Data::Dumper::Dumper \%sensors_raw;
 	}
 	if ($b_log){
@@ -17777,29 +19445,82 @@ sub process_lm_sensors {
 	return @data;
 }
 
-# oddly, openbsd sysctl actually has hw.sensors data!
+# bsds sysctl may have hw.sensors data
 sub sysctl_data {
 	eval $start if $b_log;
 	my (@data,%sensors);
-	foreach (@sysctl_sensors){
-		if (/^hw.sensors\.([0-9a-z]+)\.(temp|fan|volt)([0-9])/){
-			my $sensor = $1;
-			my $type = $2;
-			my $number = $3;
-			my @working = split(':', $_);
+	# assume always starts at 0, can't do dynamic because freebsd shows tz1 first
+	my $add = 1; 
+	foreach (@{$sysctl{'sensor'}}){
+		my ($sensor,$type,$number,$value);
+		if (/^hw\.sensors\.([a-z]+)([0-9]+)\.(cpu|temp|fan|volt)([0-9])/){
+			$sensor = $1;
+			$type = $3;
+			$number = $4;
+			# hw.sensors.cpu0.temp0:47.00 degC
+			# hw.sensors.acpitz0.temp0:43.00 degC
+			$type = 'cpu' if $sensor eq 'cpu';
+		}
+		elsif (/^hw\.sensors\.(acpi)\.(thermal)\.(tz)([0-9]+)\.(temperature)/){
+			$sensor = $1 . $3; # eg acpitz
+			$type = ($5 eq 'temperature') ? 'temp': $5;
+			$number = $4;
+		}
+		elsif (/^dev\.(cpu)\.([0-9]+)\.(temperature)/){
+			$sensor = $1;
+			$type = $3;
+			$number = $2;
+			$type = 'cpu' if $sensor eq 'cpu';
+		}
+		if ($sensor && $type){
+			if ($sensor && ((@sensors_use && !(grep {/$sensor/} @sensors_use)) ||
+			 (@sensors_exclude && (grep {/$sensor/} @sensors_exclude)))){
+				next;
+			}
+			my $working = (split(':\s*', $_))[1];
+			if (defined $working && $working =~ /^([0-9\.]+)\s?((deg)?([CF]))?\b/){
+				 $value = $1 ;
+				 $sensors{'temp-unit'} = $4 if $4 && !$sensors{'temp-unit'};
+			}
+			else {
+				next;
+			}
+			$number += $add;
+			if ($type eq 'cpu' && !defined $sensors{'cpu-temp'}){
+				$sensors{'cpu-temp'} = $value;
+			}
+			elsif ($type eq 'temp' && !defined $sensors{'temp' . $number}){
+				$sensors{'temp' . $number} = $value;
+			}
+			elsif ($type eq 'fan' && !defined $sensors{'fan-main'}->[$number]){
+				$sensors{'fan-main'}->[$number] = $value;
+			}
+			elsif ($type eq 'volt'){
+				if ($working =~ /\+3\.3V/i){
+					$sensors{'volts-3.3'} = $value;
+				}
+				elsif ($working =~ /\+5V/i){
+					$sensors{'volts-5'} = $value;
+				}
+				elsif ($working =~ /\+12V/i){
+					$sensors{'volts-12'} = $value;
+				}
+				elsif ($working =~ /VBAT/i){
+					$sensors{'volts-vbat'} = $value;
+				}
+			}
 		}
-		last if /^(hw.cpuspeed|hw.vendor|hw.physmem)/;
 	}
 	%sensors = process_data(%sensors) if %sensors;
 	main::log_data('dump','%sensors',\%sensors) if $b_log;
-	# print Data::Dumper::Dumper \%sensors;
+	print Data::Dumper::Dumper \%sensors if $dbg[31];;
 	eval $end if $b_log;
 	return %sensors;
 }
 sub set_temp_unit {
 	my ($sensors,$working) = @_;
 	my $return_unit = '';
-	if ( !$sensors && $working ){
+	if (!$sensors && $working){
 		$return_unit = $working;
 	}
 	elsif ($sensors){
@@ -17811,32 +19532,31 @@ sub set_temp_unit {
 sub process_data {
 	eval $start if $b_log;
 	my (%sensors) = @_;
-	my ($cpu_temp,$cpu2_temp,$cpu3_temp,$cpu4_temp,$index_count_fan_default,
-	$index_count_fan_main,$mobo_temp,$psu_temp) = (0,0,0,0,0,0,0,0);
-	my ($fan_type,$i,$j) = (0,0,0);
+	my ($cpu_temp,$cpu2_temp,$cpu3_temp,$cpu4_temp,$mobo_temp,$psu_temp);
+	my ($fan_type,$i,$j,$index_count_fan_default,$index_count_fan_main) = (0,0,0,0,0);
 	my $temp_diff = 20; # for C, handled for F after that is determined
 	my (@fan_main,@fan_default);
 	# first we need to handle the case where we have to determine which temp/fan to use for cpu and mobo:
 	# note, for rare cases of weird cool cpus, user can override in their prefs and force the assignment
 	# this is wrong for systems with > 2 tempX readings, but the logic is too complex with 3 variables
 	# so have to accept that it will be wrong in some cases, particularly for motherboard temp readings.
-	if ( $sensors{'temp1'} && $sensors{'temp2'} ){
-		if ( $sensors_cpu_nu ) {
+	if ($sensors{'temp1'} && $sensors{'temp2'}){
+		if ($sensors_cpu_nu){
 			$fan_type = $sensors_cpu_nu;
 		}
 		else {
 			# first some fringe cases with cooler cpu than mobo: assume which is cpu temp based on fan speed
 			# but only if other fan speed is 0.
-			if ( $sensors{'temp1'} >= $sensors{'temp2'} && 
-			     defined $fan_default[1] && defined $fan_default[2] && $fan_default[1] == 0 && $fan_default[2] > 0 ) {
+			if ($sensors{'temp1'} >= $sensors{'temp2'} && 
+			 defined $fan_default[1] && defined $fan_default[2] && $fan_default[1] == 0 && $fan_default[2] > 0){
 				$fan_type = 2;
 			}
-			elsif ( $sensors{'temp2'} >= $sensors{'temp1'} && 
-			        defined $fan_default[1] && defined $fan_default[2] && $fan_default[2] == 0 && $fan_default[1] > 0 ) {
+			elsif ($sensors{'temp2'} >= $sensors{'temp1'} && 
+			 defined $fan_default[1] && defined $fan_default[2] && $fan_default[2] == 0 && $fan_default[1] > 0){
 				$fan_type = 1;
 			}
 			# then handle the standard case if these fringe cases are false
-			elsif ( $sensors{'temp1'} >= $sensors{'temp2'} ) {
+			elsif ($sensors{'temp1'} >= $sensors{'temp2'}){
 				$fan_type = 1;
 			}
 			else {
@@ -17845,24 +19565,24 @@ sub process_data {
 		}
 	}
 	# need a case for no temps at all reported, like with old intels
-	elsif ( !$sensors{'temp2'} && !$sensors{'cpu-temp'} ){
-		if ( !$sensors{'temp1'} && !$sensors{'mobo-temp'} ){
+	elsif (!$sensors{'temp2'} && !$sensors{'cpu-temp'}){
+		if (!$sensors{'temp1'} && !$sensors{'mobo-temp'}){
 			$fan_type = 1;
 		}
-		elsif ( $sensors{'temp1'} && !$sensors{'mobo-temp'} ){
+		elsif ($sensors{'temp1'} && !$sensors{'mobo-temp'}){
 			$fan_type = 1;
 		}
-		elsif ( $sensors{'temp1'} && $sensors{'mobo-temp'} ){
+		elsif ($sensors{'temp1'} && $sensors{'mobo-temp'}){
 			$fan_type = 1;
 		}
 	}
 	# convert the diff number for F, it needs to be bigger that is
-	if ( $sensors{'temp-unit'} && $sensors{'temp-unit'} eq "F" ) {
+	if ($sensors{'temp-unit'} && $sensors{'temp-unit'} eq "F"){
 		$temp_diff = $temp_diff * 1.8
 	}
-	if ( $sensors{'cpu-temp'} ) {
+	if ($sensors{'cpu-temp'}){
 		# specific hack to handle broken CPUTIN temps with PECI
-		if ( $sensors{'cpu-peci-temp'} && ( $sensors{'cpu-temp'} - $sensors{'cpu-peci-temp'} ) > $temp_diff ){
+		if ($sensors{'cpu-peci-temp'} && ($sensors{'cpu-temp'} - $sensors{'cpu-peci-temp'}) > $temp_diff){
 			$cpu_temp = $sensors{'cpu-peci-temp'};
 		}
 		# then get the real cpu temp, best guess is hottest is real, though only within narrowed diff range
@@ -17871,10 +19591,10 @@ sub process_data {
 		}
 	}
 	else {
-		if ($fan_type ){
+		if ($fan_type){
 			# there are some weird scenarios
-			if ( $fan_type == 1 ){
-				if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'} ) {
+			if ($fan_type == 1){
+				if ($sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'}){
 					$cpu_temp = $sensors{'temp2'};
 				}
 				else {
@@ -17882,7 +19602,7 @@ sub process_data {
 				}
 			}
 			else {
-				if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'} ) {
+				if ($sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'}){
 					$cpu_temp = $sensors{'temp1'};
 				}
 				else {
@@ -17893,36 +19613,36 @@ sub process_data {
 		else {
 			$cpu_temp = $sensors{'temp1'}; # can be null, that is ok
 		}
-		if ( $cpu_temp ) {
+		if ($cpu_temp){
 			# using $sensors{'temp3'} is just not reliable enough, more errors caused than fixed imo
-			#if ( $sensors{'temp3'} && $sensors{'temp3'} > $cpu_temp ) {
+			# if ($sensors{'temp3'} && $sensors{'temp3'} > $cpu_temp){
 			#	$cpu_temp = $sensors{'temp3'};
-			#}
+			# }
 			# there are some absurdly wrong $sensors{'temp1'}: acpitz-virtual-0 $sensors{'temp1'}: +13.8°C
-			if ( $sensors{'core-0-temp'} && ($sensors{'core-0-temp'} - $cpu_temp) > $temp_diff ) {
+			if ($sensors{'core-0-temp'} && ($sensors{'core-0-temp'} - $cpu_temp) > $temp_diff){
 				$cpu_temp = $sensors{'core-0-temp'};
 			}
 		}
 	}
 	# if all else fails, use core0/peci temp if present and cpu is null
-	if ( !$cpu_temp ) {
-		if ( $sensors{'core-0-temp'} ) {
+	if (!$cpu_temp){
+		if ($sensors{'core-0-temp'}){
 			$cpu_temp = $sensors{'core-0-temp'};
 		}
 		# note that peci temp is known to be colder than the actual system
 		# sometimes so it is the last fallback we want to use even though in theory
 		# it is more accurate, but fact suggests theory wrong.
-		elsif ( $sensors{'cpu-peci-temp'} ) {
+		elsif ($sensors{'cpu-peci-temp'}){
 			$cpu_temp = $sensors{'cpu-peci-temp'};
 		}
 	}
 	# then the real mobo temp
-	if ( $sensors{'mobo-temp'} ){
+	if ($sensors{'mobo-temp'}){
 		$mobo_temp = $sensors{'mobo-temp'};
 	}
-	elsif ( $fan_type ){
-		if ( $fan_type == 1 ) {
-			if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'} ) {
+	elsif ($fan_type){
+		if ($fan_type == 1){
+			if ($sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp2'} > $sensors{'temp1'}){
 				$mobo_temp = $sensors{'temp1'};
 			}
 			else {
@@ -17930,7 +19650,7 @@ sub process_data {
 			}
 		}
 		else {
-			if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'} ) {
+			if ($sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp1'} > $sensors{'temp2'}){
 				$mobo_temp = $sensors{'temp2'};
 			}
 			else {
@@ -17938,35 +19658,42 @@ sub process_data {
 			}
 		}
 		## NOTE: not safe to assume $sensors{'temp3'} is the mobo temp, sad to say
-		#if ( $sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp3'} && $sensors{'temp3'} < $mobo_temp ) {
-		#	$mobo_temp = $sensors{'temp3'};
-		#}
+		# if ($sensors{'temp1'} && $sensors{'temp2'} && $sensors{'temp3'} && $sensors{'temp3'} < $mobo_temp){
+		#		$mobo_temp = $sensors{'temp3'};
+		# }
 	}
+	# in case with cpu-temp AND temp1 and not temp 2, or temp 2 only, fan type: 0
 	else {
-		$mobo_temp = $sensors{'temp2'};
+		if ($sensors{'cpu-temp'} && $sensors{'temp1'} && 
+		 $sensors{'cpu-temp'} > $sensors{'temp1'}){
+			$mobo_temp = $sensors{'temp1'};
+		}
+		elsif ($sensors{'temp2'}){
+			$mobo_temp = $sensors{'temp2'};
+		}
 	}
 	@fan_main = @{$sensors{'fan-main'}} if $sensors{'fan-main'};
 	$index_count_fan_main = (@fan_main) ? scalar @fan_main : 0;
 	@fan_default = @{$sensors{'fan-default'}} if $sensors{'fan-default'};
 	$index_count_fan_default = (@fan_default) ? scalar @fan_default : 0;
 	# then set the cpu fan speed
-	if ( ! $fan_main[1] ) {
+	if (!$fan_main[1]){
 		# note, you cannot test for $fan_default[1] or [2] != "" 
 		# because that creates an array item in gawk just by the test itself
-		if ( $fan_type == 1 && defined $fan_default[1] ) {
+		if ($fan_type == 1 && defined $fan_default[1]){
 			$fan_main[1] = $fan_default[1];
 			$fan_default[1] = undef;
 		}
-		elsif ( $fan_type == 2 && defined $fan_default[2] ) {
+		elsif ($fan_type == 2 && defined $fan_default[2]){
 			$fan_main[1] = $fan_default[2];
 			$fan_default[2] = undef;
 		}
 	}
 	# clear out any duplicates. Primary fan real trumps fan working always if same speed
-	for ($i = 1; $i <= $index_count_fan_main; $i++) {
-		if ( defined $fan_main[$i] && $fan_main[$i] ) {
-			for ($j = 1; $j <= $index_count_fan_default; $j++) {
-				if ( defined $fan_default[$j] && $fan_main[$i] == $fan_default[$j] ) {
+	for ($i = 1; $i <= $index_count_fan_main; $i++){
+		if (defined $fan_main[$i] && $fan_main[$i]){
+			for ($j = 1; $j <= $index_count_fan_default; $j++){
+				if (defined $fan_default[$j] && $fan_main[$i] == $fan_default[$j]){
 					$fan_default[$j] = undef;
 				}
 			}
@@ -17980,18 +19707,18 @@ sub process_data {
 	# shows the proper value, so the corruption might be internal in awk. 
 	# Note: gensub is the culprit I think, assigning type string for range 501-1000 but 
 	# type integer for all others, this triggers true for >
-	for ($j = 1; $j <= $index_count_fan_default; $j++) {
-		if ( defined $fan_default[$j] && $fan_default[$j] > 5000 && !$fan_main[2] ) {
+	for ($j = 1; $j <= $index_count_fan_default; $j++){
+		if (defined $fan_default[$j] && $fan_default[$j] > 5000 && !$fan_main[2]){
 			$fan_main[2] = $fan_default[$j];
 			$fan_default[$j] = '';
 			# then add one if required for output
-			if ( $index_count_fan_main < 2 ) {
+			if ($index_count_fan_main < 2){
 				$index_count_fan_main = 2;
 			}
 		}
 	}
 	# if they are ALL null, print error message. psFan is not used in output currently
-	if ( !$cpu_temp && !$mobo_temp && !$fan_main[1] && !$fan_main[2] && !$fan_main[1] && !@fan_default ) {
+	if (!$cpu_temp && !$mobo_temp && !$fan_main[1] && !$fan_main[2] && !$fan_main[1] && !@fan_default){
 		%sensors = ();
 	}
 	else {
@@ -18009,7 +19736,7 @@ sub process_data {
 		$psu2_fan = $sensors{'fan-psu-2'} if $sensors{'fan-psu-2'};
 		# so far only for ipmi, sensors data is junk for volts
 		if ($extra > 0 && 
-		    ($sensors{'volts-12'} || $sensors{'volts-5'} || $sensors{'volts-3.3'} || $sensors{'volts-vbat'}) ){
+		    ($sensors{'volts-12'} || $sensors{'volts-5'} || $sensors{'volts-3.3'} || $sensors{'volts-vbat'})){
 			$v_12 = $sensors{'volts-12'} if $sensors{'volts-12'};
 			$v_5 = $sensors{'volts-5'} if $sensors{'volts-5'};
 			$v_3_3 = $sensors{'volts-3.3'} if  $sensors{'volts-3.3'};
@@ -18040,7 +19767,7 @@ sub process_data {
 		if ($sodimm_temp){
 			$sensors{'sodimm-temp'} = $sodimm_temp;
 		}
-		if ($extra > 0 && ($v_12 || $v_5 || $v_3_3 || $v_vbat) ){
+		if ($extra > 0 && ($v_12 || $v_5 || $v_3_3 || $v_vbat)){
 			$sensors{'volts-12'} = $v_12;
 			$sensors{'volts-5'} = $v_5;
 			$sensors{'volts-3.3'} = $v_3_3;
@@ -18056,15 +19783,15 @@ sub process_data {
 }
 sub gpu_data {
 	eval $start if $b_log;
-	return @gpudata if $b_gpudata;
+	return @gpudata if $loaded{'gpu-data'};
 	my ($cmd,@data,@data2,$path,@screens,$temp);
 	my ($j) = (0);
 	if ($path = main::check_program('nvidia-settings')){
 		# first get the number of screens. This only work if you are in X
-		if ($b_display) {
+		if ($b_display){
 			@data = main::grabber("$path -q screens 2>/dev/null");
 			foreach (@data){
-				if ( /(:[0-9]\.[0-9])/ ) {
+				if (/(:[0-9]\.[0-9])/){
 					push(@screens, $1);
 				}
 			}
@@ -18141,7 +19868,7 @@ sub gpu_data {
 		}
 	}
 	if ($sensors_raw{'gpu'}){
-		#my ($b_found,$holder) = (0,'');
+		# my ($b_found,$holder) = (0,'');
 		foreach my $adapter (keys %{$sensors_raw{'gpu'}}){
 			$j = scalar @gpudata;
 			$gpudata[$j]->{'type'} = $adapter;
@@ -18176,32 +19903,32 @@ sub gpu_data {
 	}
 	main::log_data('dump','sensors output: video: @gpudata',\@gpudata);
 	# we'll probably use this data elsewhere so make it a one time call
-	$b_gpudata = 1;
-	print 'gpudata: ', Data::Dumper::Dumper \@gpudata if $test[18];
+	$loaded{'gpu-data'} = 1;
+	print 'gpudata: ', Data::Dumper::Dumper \@gpudata if $dbg[18];
 	eval $end if $b_log;
 	return @gpudata;
 }
 }
 
-## SlotData
+## SlotItem
 {
-package SlotData;
-
+package SlotItem;
 sub get {
 	eval $start if $b_log;
 	my (@rows,$key1,$val1);
 	my $num = 0;
-	if ($b_fake_dmidecode || ( $alerts{'dmidecode'}->{'action'} eq 'use' && (!$b_arm || $b_slot_tool ) )){
+	if ($fake{'dmidecode'} || ($alerts{'dmidecode'}->{'action'} eq 'use' && 
+	 (!$b_arm || $use{'slot-tool'}))){
 		@rows = slot_output();
 	}
-	elsif ($b_arm && !$b_slot_tool){
+	elsif ($b_arm && !$use{'slot-tool'}){
 		$key1 = 'ARM';
 		$val1 = main::row_defaults('arm-pci','');
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
 	}
-	elsif ( $alerts{'dmidecode'}->{'action'} ne 'use'){
+	elsif ($alerts{'dmidecode'}->{'action'} ne 'use'){
 		$key1 = $alerts{'dmidecode'}->{'action'};
-		$val1 = $alerts{'dmidecode'}->{$key1};
+		$val1 = $alerts{'dmidecode'}->{'message'};
 		$key1 = ucfirst($key1);
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
 	}
@@ -18240,11 +19967,11 @@ sub slot_output {
 				}
 			}
 			if ($type){
-				$id = 'N/A' if ($id eq '' );
+				$id = 'N/A' if ($id eq '');
 				if ($type eq 'Other' && $designation){
 					$type = $designation;
 				}
-				elsif ($type && $designation) {
+				elsif ($type && $designation){
 					$type = "$type $designation";
 				}
 				push(@rows, {
@@ -18252,7 +19979,7 @@ sub slot_output {
 				main::key($num++,0,2,'type') => $type,
 				main::key($num++,0,2,'status') => $usage,
 				},);
-				if ($extra > 1 ){
+				if ($extra > 1){
 					$rows[$j]->{main::key($num++,0,2,'length')} = $length;
 				}
 			}
@@ -18269,15 +19996,15 @@ sub slot_output {
 }
 }
 
-## SwapData 
+## SwapItem 
 {
-package SwapData;
+package SwapItem;
 
 sub get {
 	eval $start if $b_log;
 	my (@rows);
 	my $num = 0;
-	@rows = swap_output();
+	@rows = create_output();
 	if (!@rows){
 		push(@rows, 
 		{main::key($num++,0,1,'Alert') => main::row_defaults('swap-data')},
@@ -18286,20 +20013,20 @@ sub get {
 	eval $end if $b_log;
 	return @rows;
 }
-sub swap_output {
+sub create_output {
 	eval $start if $b_log;
 	my $num = 0;
 	my $j = 0;
-	my (%part,@rows,$dev,$percent,$raw_size,$size,$used);
-	main::set_proc_partitions() if !$bsd_type && !$b_proc_partitions;
-	main::set_mapper() if !$b_mapper;
-	my @swap_data = PartitionData::swap_data();
-	foreach my $row (@swap_data){
+	my (@rows,$dev,$percent,$raw_size,$size,$used);
+	PartitionData::set() if !$bsd_type && !$loaded{'partition-data'};
+	DiskDataBSD::set() if $bsd_type && !$loaded{'disk-data-bsd'};
+	main::set_mapper() if !$loaded{'mapper'};
+	PartitionItem::swap_data() if !$loaded{'set-swap'};
+	foreach my $row (@swaps){
 		$num = 1;
 		$size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
 		$used = main::get_size($row->{'used'},'string','N/A'); # used can be 0
 		$percent = (defined $row->{'percent-used'}) ? ' (' . $row->{'percent-used'} . '%)' : '';
-		%part = ();
 		$dev = ($row->{'swap-type'} eq 'file') ? 'file' : 'dev';
 		$row->{'swap-type'} = ($row->{'swap-type'}) ? $row->{'swap-type'} : 'N/A';
 		if ($b_admin && !$bsd_type && $j == 0){
@@ -18310,7 +20037,7 @@ sub swap_output {
 					$rows[$j]->{main::key($num++,0,2,'swappiness')} = $row->{'swappiness'};
 				}
 				if (defined $row->{'cache-pressure'}){
-					$rows[$j]->{main::key($num++,0,2,'cache pressure')} = $row->{'cache-pressure'};
+					$rows[$j]->{main::key($num++,0,2,'cache-pressure')} = $row->{'cache-pressure'};
 				}
 			}
 			else {
@@ -18323,10 +20050,10 @@ sub swap_output {
 		main::key($num++,0,2,'type') => $row->{'swap-type'},
 		});
 		# not used for swap as far as I know
-		if ($b_admin && $row->{'raw-size'} ){
+		if ($b_admin && $row->{'raw-size'}){
 			# It's an error! permissions or missing tool
 			$raw_size = main::get_size($row->{'raw-size'},'string');
-			$rows[$j]->{main::key($num++,0,2,'raw size')} = $raw_size;
+			$rows[$j]->{main::key($num++,0,2,'raw-size')} = $raw_size;
 		}
 		# not used for swap as far as I know
 		if ($b_admin && $row->{'raw-available'} && $size ne 'N/A'){
@@ -18336,7 +20063,7 @@ sub swap_output {
 		$rows[$j]->{main::key($num++,0,2,'used')} = $used . $percent;
 		# not used for swap as far as I know
 		if ($b_admin && $row->{'block-size'}){
-			$rows[$j]->{main::key($num++,0,2,'block size')} = $row->{'block-size'} . ' B';;
+			$rows[$j]->{main::key($num++,0,2,'block-size')} = $row->{'block-size'} . ' B';;
 			#$rows[$j]->{main::key($num++,0,2,'physical')} = $row->{'block-size'} . ' B';
 			#$rows[$j]->{main::key($num++,0,2,'logical')} = $row->{'block-logical'} . ' B';
 		}
@@ -18351,13 +20078,19 @@ sub swap_output {
 		if ($extra > 0 && $row->{'dev-mapped'}){
 			$rows[$j]->{main::key($num++,0,3,'mapped')} = $row->{'dev-mapped'};
 		}
-		if ($show{'label'} && ($row->{'label'} || $row->{'swap-type'} eq 'partition') ){
-			$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '') if $use{'filter-label'};
-			$rows[$j]->{main::key($num++,0,2,'label')} = ($row->{'label'}) ? $row->{'label'}: 'N/A';
+		if ($show{'label'} && ($row->{'label'} || $row->{'swap-type'} eq 'partition')){
+			if ($use{'filter-label'}){
+				$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '');
+			}
+			$row->{'label'} ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'label')} = $row->{'label'};
 		}
-		if ($show{'uuid'} && ($row->{'uuid'} || $row->{'swap-type'} eq 'partition' )){
-			$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '') if $use{'filter-uuid'};
-			$rows[$j]->{main::key($num++,0,2,'uuid')} = ($row->{'uuid'}) ? $row->{'uuid'}: 'N/A';
+		if ($show{'uuid'} && ($row->{'uuid'} || $row->{'swap-type'} eq 'partition')){
+			if ($use{'filter-uuid'}){
+				$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '');
+			}
+			$row->{'uuid'} ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
 		}
 	}
 	eval $end if $b_log;
@@ -18366,27 +20099,47 @@ sub swap_output {
 
 }
 
-## UnmountedData
+## UnmountedItem
 {
-package UnmountedData;
+package UnmountedItem;
 
 sub get {
 	eval $start if $b_log;
 	my (@data,@rows,$key1,$val1);
 	my $num = 0;
 	if ($bsd_type){
-		$key1 = 'Message';
-		$val1 = main::row_defaults('unmounted-data-bsd');
+		DiskDataBSD::set() if !$loaded{'disk-data-bsd'};
+		if (%disks_bsd && ($alerts{'disklabel'}->{'action'} eq 'use' ||
+		 $alerts{'gpart'}->{'action'} eq 'use')){
+			@data = bsd_data();
+			if (!@data){
+				$key1 = 'Message';
+				$val1 = main::row_defaults('unmounted-data');
+			}
+			else {
+				@rows = create_output(\@data);
+			}
+		}
+		else {
+			if ($alerts{'disklabel'}->{'action'} eq 'permissions'){
+				$key1 = 'Message';
+				$val1 = $alerts{'disklabel'}->{'message'};
+			}
+			else {
+				$key1 = 'Message';
+				$val1 = main::row_defaults('unmounted-data-bsd',$uname[0]);
+			}
+		}
 	}
  	else {
-		if (main::system_files('partitions')){
-			@data = unmounted_data();
+		if ($system_files{'proc-partitions'}){
+			@data = proc_data();
 			if (!@data){
 				$key1 = 'Message';
 				$val1 = main::row_defaults('unmounted-data');
 			}
 			else {
-				@rows = unmounted_output(\@data);
+				@rows = create_output(\@data);
 			}
 		}
 		else {
@@ -18400,12 +20153,13 @@ sub get {
 	eval $end if $b_log;
 	return @rows;
 }
-sub unmounted_output {
+sub create_output {
 	eval $start if $b_log;
 	my ($unmounted) = @_;
 	my (@rows,$fs);
 	my ($j,$num) = (0,0);
 	@$unmounted = sort { $a->{'dev-base'} cmp $b->{'dev-base'} } @$unmounted;
+	my $fs_skip = PartitionItem::fs_excludes('label-uuid');
 	foreach my $row (@$unmounted){
 		$num = 1;
 		my $size = ($row->{'size'}) ? main::get_size($row->{'size'},'string') : 'N/A';
@@ -18413,15 +20167,16 @@ sub unmounted_output {
 			$fs = lc($row->{'fs'});
 		}
 		else {
-			if (main::check_program('file')){
+			if ($bsd_type){
+				$fs = 'N/A';
+			}
+			elsif (main::check_program('file')){
 				$fs = ($b_root) ? 'N/A' : main::row_defaults('root-required');
 			}
 			else {
 				$fs = main::row_defaults('tool-missing-basic','file');
 			}
 		}
-		$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '') if $use{'filter-label'};
-		$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '') if $use{'filter-uuid'};
 		$j = scalar @rows;
 		push(@rows, {
 		main::key($num++,1,1,'ID') => "/dev/$row->{'dev-base'}",
@@ -18432,15 +20187,32 @@ sub unmounted_output {
 		if ($extra > 0 && $row->{'dev-mapped'}){
 			$rows[$j]->{main::key($num++,0,2,'mapped')} = $row->{'dev-mapped'};
 		}
+		$row->{'label'} ||= 'N/A';
+		$row->{'uuid'} ||= 'N/A';
 		$rows[$j]->{main::key($num++,0,2,'size')} = $size;
 		$rows[$j]->{main::key($num++,0,2,'fs')} = $fs;
-		$rows[$j]->{main::key($num++,0,2,'label')} = $row->{'label'};
-		$rows[$j]->{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
+		# don't show for fs known to not have label/uuid
+		if (($show{'label'} || $show{'uuid'}) && $fs !~ /^(fuse(blk)?[\._-]?)?($fs_skip)$/){
+			if ($show{'label'}){
+				if ($use{'filter-label'}){
+					$row->{'label'} = main::apply_partition_filter('part', $row->{'label'}, '');
+				}
+				$row->{'label'} ||= 'N/A';
+				$rows[$j]->{main::key($num++,0,2,'label')} = $row->{'label'};
+			}
+			if ($show{'uuid'}){
+				if ($use{'filter-uuid'}){
+					$row->{'uuid'} = main::apply_partition_filter('part', $row->{'uuid'}, '');
+				}
+				$row->{'uuid'} ||= 'N/A';
+				$rows[$j]->{main::key($num++,0,2,'uuid')} = $row->{'uuid'};
+			}
+		}
 	}
 	eval $end if $b_log;
 	return @rows;
 }
-sub unmounted_data {
+sub proc_data {
 	eval $start if $b_log;
 	my ($dev_mapped,$fs,$label,$maj_min,$size,$uuid,%part,@unmounted);
 	# last filters to make sure these are dumped
@@ -18448,10 +20220,10 @@ sub unmounted_data {
 	'dvd[0-9]*','dvdrw[0-9]*','fd[0-9]','ram[0-9]*');
 	my $num = 0;
 	# set labels, uuid, gpart
-	PartitionData::partition_data() if !$b_partitions;
-	RaidData::raid_data() if !$b_raid;
+	PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+	RaidItem::raid_data() if !$loaded{'raid'};
 	my @mounted = get_mounted();
-	#print join("\n",(@filters,@mounted)),"\n";
+	# print join("\n",(@filters,@mounted)),"\n";
 	foreach my $row (@proc_partitions){
 		($dev_mapped,$fs,$label,$maj_min,$uuid,$size) = ('','','','','','');
 		# note that size 1 means it is a logical extended partition container
@@ -18461,18 +20233,23 @@ sub unmounted_data {
 		# note: $working[2] != 1 is wrong, it's not related
 		# note: for zfs using /dev/sda no partitions, previous rule would have removed
 		# the unmounted report because sdb was found in sdb1, but match of eg sdb1 and sdb12
-		# makes this a problem, so usinig zfs_member test instead to filter out zfs members.
-		# in arm/android seen /dev/block/mmcblk0p12
-		#print "mount: $row->[-1]\n";
-		if ( $row->[-1] !~ /^(nvme[0-9]+n|mmcblk|mtdblk|mtdblock)[0-9]+$/ && 
-		     $row->[-1] =~ /[a-z][0-9]+$|dm-[0-9]+$/ && 
-		     $row->[-1] !~ /\bloop/ && 
-		     !(grep {$row->[-1] =~ /$_$/} (@filters,@mounted)) && 
-		     !(grep {$_ =~ /(block\/)?$row->[-1]$/} @mounted)){
+		# makes this a problem, so using zfs_member test instead to filter out zfs members.
+		# For zfs using entire disk, ie, sda, in that case, all partitions sda1 sda9 (8BiB) 
+		# belong to zfs, and aren't unmmounted, so if sda and partition sda9,
+		# remove from list. this only works for sdxx drives, but is better than no fix
+		# This logic may also end up working for btrfs partitions, and maybe hammer?
+		# In arm/android seen /dev/block/mmcblk0p12
+		# print "mount: $row->[-1]\n";
+		if ($row->[-1] !~ /^(nvme[0-9]+n|mmcblk|mtdblk|mtdblock)[0-9]+$/ && 
+		    $row->[-1] =~ /[a-z][0-9]+$|dm-[0-9]+$/ && 
+		    $row->[-1] !~ /\bloop/ && 
+		    !(grep {$row->[-1] =~ /$_$/} (@filters,@mounted)) && 
+		    !(grep {$_ =~ /(block\/)?$row->[-1]$/} @mounted) &&
+		    !(grep {$_ =~ /^sd[a-z]+$/ && $row->[-1] =~ /^$_[0-9]+/} @mounted)){
 			$dev_mapped = $dmmapper{$row->[-1]} if $dmmapper{$row->[-1]};
 			if (@lsblk){
 				my $id = ($dev_mapped) ? $dev_mapped: $row->[-1];
-				%part = main::get_lsblk($id);
+				%part = LsblkData::get($id);
 				if (%part){
 					$fs = $part{'fs'};
 					$label = $part{'label'};
@@ -18484,14 +20261,21 @@ sub unmounted_data {
 			$size ||= $row->[2];
 			$fs = unmounted_filesystem($row->[-1]) if !$fs;
 			# seen: (zfs|lvm2|linux_raid)_member; crypto_luks
-			# no			te: lvm, raid members are neverm ounted. luks member is never mounted.
+			# note: lvm, raid members are never mounted. luks member is never mounted.
 			next if $fs && $fs =~ /(bcache|crypto|luks|_member)$/i; 
 			# these components of lvm raid will show as partitions byt are reserved private lvm member
 			# See man lvm for all current reserved private volume names
 			next if $dev_mapped && $dev_mapped =~ /_([ctv]data|corig|[mr]image|mlog|[crt]meta|pmspare|pvmove|vorigin)(_[0-9]+)?$/;
-			$label = PartitionData::get_label("/dev/$row->[-1]") if !$label;
+			if (!$bsd_type){
+				$label = PartitionItem::get_label("/dev/$row->[-1]") if !$label;
+				$uuid = PartitionItem::get_uuid("/dev/$row->[-1]") if !$uuid;
+			}
+			else {
+				my @temp = GpartData::get($row->[-1]);
+				$label = $temp[1] if $temp[1];
+				$uuid = $temp[2] if $temp[2];
+			}
 			$maj_min = "$row->[0]:$row->[1]" if !$maj_min;
-			$uuid = PartitionData::get_uuid("/dev/$row->[-1]") if !$uuid;
 			push(@unmounted, {
 			'dev-base' => $row->[-1],
 			'dev-mapped' => $dev_mapped,
@@ -18503,39 +20287,84 @@ sub unmounted_data {
 			});
 		}
 	}
-	# print Data::Dumper::Dumper @unmounted;
+	print Data::Dumper::Dumper \@unmounted if $dbg[35];
+	main::log_data('dump','@unmounted',\@unmounted) if $b_log;
+	eval $end if $b_log;
+	return @unmounted;
+}
+sub bsd_data {
+	eval $start if $b_log;
+	my ($fs,$label,$size,$uuid,%part,@unmounted);
+	PartitionItem::set_partitions() if !$loaded{'set-partitions'};
+	RaidItem::raid_data() if !$loaded{'raid'};
+	my @mounted = get_mounted();
+	foreach my $id (sort keys %disks_bsd){
+		next if !$disks_bsd{$id}->{'partitions'};
+		foreach my $part (sort keys %{$disks_bsd{$id}->{'partitions'}}){
+			if (!(grep {$_ =~ /$part$/} @mounted)){
+				$fs = $disks_bsd{$id}->{'partitions'}{$part}{'fs'};
+				next if $fs && $fs =~ /(raid|_member)$/i; 
+				$label = $disks_bsd{$id}->{'partitions'}{$part}{'label'};
+				$size = $disks_bsd{$id}->{'partitions'}{$part}{'size'};
+				$uuid = $disks_bsd{$id}->{'partitions'}{$part}{'uuid'};
+				# $fs = unmounted_filesystem($part) if !$fs;
+				push(@unmounted, {
+				'dev-base' => $part,
+				'dev-mapped' => '',
+				'fs' => $fs,
+				'label' => $label,
+				'maj-min' => '',
+				'size' => $size,
+				'uuid' => $uuid,
+				});
+			}
+		}
+	}
+	print Data::Dumper::Dumper \@unmounted if $dbg[35];
 	main::log_data('dump','@unmounted',\@unmounted) if $b_log;
 	eval $end if $b_log;
 	return @unmounted;
 }
 sub get_mounted {
 	eval $start if $b_log;
-	my (@mounted);
+	my (@arrays,@mounted);
 	foreach my $row (@partitions){
 		push(@mounted, $row->{'dev-base'}) if $row->{'dev-base'};
 	}
-	foreach my $row ((@lvm_raid,@md_raid,@zfs_raid)){
+	# print Data::Dumper::Dumper \@zfs_raid;
+	foreach my $row ((@btrfs_raid,@lvm_raid,@md_raid,@soft_raid,@zfs_raid)){
 		# we want to not show md0 etc in unmounted report
 		push(@mounted, $row->{'id'}) if $row->{'id'}; 
-		my @arrays = (ref $row->{'arrays'} eq 'ARRAY' ) ? @{$row->{'arrays'}} : ();
+		# print Data::Dumper::Dumper $row;
+		# row->arrays->components: zfs; row->components: lvm,mdraid,softraid
+		if ($row->{'arrays'} && ref $row->{'arrays'} eq 'ARRAY'){
+			push(@arrays,@{$row->{'arrays'}});
+		}
+		elsif ($row->{'components'} && ref $row->{'components'} eq 'ARRAY'){
+			push(@arrays,$row);
+		}
 		@arrays = grep {defined $_} @arrays;
-		foreach my $array (@arrays){
-			my @components = (ref $array->{'components'} eq 'ARRAY') ? @{$array->{'components'}} : ();
+		# print Data::Dumper::Dumper \@arrays;
+		foreach my $item (@arrays){
+			# print Data::Dumper::Dumper $item;
+			my @components = (ref $item->{'components'} eq 'ARRAY') ? @{$item->{'components'}} : ();
 			foreach my $component (@components){
-				my @temp = split('~', $component);
-				push(@mounted, $temp[0]);
+				# md has ~, not zfs,lvm,softraid
+				my $temp = (split('~', $component->[0]))[0]; 
+				push(@mounted, $temp);
 			}
 		}
 	}
 	eval $end if $b_log;
 	return @mounted;
 }
+# bsds do not seem to return any useful data so only for linux
 sub unmounted_filesystem {
 	eval $start if $b_log;
 	my ($item) = @_;
 	my ($data,%part);
 	my ($file,$fs,$path) = ('','','');
-	if ($path = main::check_program('file')) {
+	if ($path = main::check_program('file')){
 		$file = $path;
 	}
 	# order matters in this test!
@@ -18547,7 +20376,7 @@ sub unmounted_filesystem {
 		# this will fail if regular user and no sudo present, but that's fine, it will just return null
 		# note the hack that simply slices out the first line if > 1 items found in string
 		# also, if grub/lilo is on partition boot sector, no file system data is available
-		$data = (main::grabber("$sudo$file -s /dev/$item 2>/dev/null"))[0];
+		$data = (main::grabber("$sudoas$file -s /dev/$item 2>/dev/null"))[0];
 		if ($data){
 			foreach (@filesystems){
 				if ($data =~ /($_)[\s,]/i){
@@ -18564,22 +20393,36 @@ sub unmounted_filesystem {
 }
 }
 
-## UsbData
+## UsbItem
 {
-package UsbData;
-
+package UsbItem;
 sub get {
 	eval $start if $b_log;
 	my (@rows,$key1,$val1);
 	my $num = 0;
-	if ( !@usb && $alerts{'lsusb'}->{'action'} ne 'use' && $alerts{'usbdevs'}->{'action'} ne 'use'){
-		if ($os eq 'linux' ){
+	if (!$usb{'main'} && $alerts{'lsusb'}->{'action'} ne 'use' && 
+	 $alerts{'usbdevs'}->{'action'} ne 'use' &&
+	 $alerts{'usbconfig'}->{'action'} ne 'use'){
+		if ($os eq 'linux'){
 			$key1 = $alerts{'lsusb'}->{'action'};
-			$val1 = $alerts{'lsusb'}->{$key1};
+			$val1 = $alerts{'lsusb'}->{'message'};
 		}
 		else {
-			$key1 = $alerts{'usbdevs'}->{'action'};
-			$val1 = $alerts{'usbdevs'}->{$key1};
+			# note: usbdevs only has 'missing', usbconfig has missing/permissions
+			# both have platform, but irrelevant since testing for linux here
+			if ($alerts{'usbdevs'}->{'action'} eq 'missing' && 
+			 $alerts{'usbconfig'}->{'action'} eq 'missing'){
+				$key1 = $alerts{'usbdevs'}->{'action'};
+				$val1 = main::row_defaults('tools-missing-bsd','usbdevs/usbconfig');
+			}
+			elsif ($alerts{'usbconfig'}->{'action'} eq 'permissions'){
+				$key1 = $alerts{'usbconfig'}->{'action'};
+				$val1 = $alerts{'usbconfig'}->{'message'};
+			}
+# 			elsif ($alerts{'lsusb'}->{'action'} eq 'missing'){
+# 				$key1 = $alerts{'lsusb'}->{'action'};
+# 				$val1 = $alerts{'lsusb'}->{'message'};
+# 			}
 		}
 		$key1 = ucfirst($key1);
 		@rows = ({main::key($num++,0,1,$key1) => $val1,});
@@ -18598,20 +20441,19 @@ sub get {
 }
 sub usb_output {
 	eval $start if $b_log;
-	return if ! @usb;
+	return if !$usb{'main'};
 	my (@rows);
 	my ($b_hub,$bus_id,$chip_id,$driver,$ind_sc,$path_id,$ports,$product,$serial,$speed,$type);
 	my $num = 0;
 	my $j = 0;
-	# note: the data has been presorted in set_lsusb_data by:
-	# bus id then device id, so we don't need to worry about the order
-	foreach my $id (@usb){
+	# note: the data has been presorted in UsbData:
+	# bus alpah id, so we don't need to worry about the order
+	foreach my $id (@{$usb{'main'}}){
 		$j = scalar @rows;
 		($b_hub,$ind_sc,$num) = (0,3,1);
-		$chip_id = $id->[7];
 		($driver,$path_id,$ports,$product,
 		$serial,$speed,$type) = ('','','','','','','');
-		$speed  = ( main::is_numeric($id->[8]) ) ? sprintf("%1.1f",$id->[8]) : $id->[8] if $id->[8];
+		$speed  = (main::is_numeric($id->[8])) ? sprintf("%1.1f",$id->[8]) : $id->[8] if $id->[8];
 		$product = main::cleaner($id->[13]) if $id->[13];
 		$serial = main::apply_filter($id->[16]) if $id->[16];
 		$product ||= 'N/A';
@@ -18622,7 +20464,7 @@ sub usb_output {
 		if ($id->[4] eq '09'){
 			$ports = $id->[10] if $id->[10];
 			$ports ||= 'N/A';
-			#print "pt0:$protocol\n";
+			# print "pt0:$protocol\n";
 			push(@rows, {
 			main::key($num++,1,1,'Hub') => $bus_id,
 			main::key($num++,0,2,'info') => $product,
@@ -18638,7 +20480,7 @@ sub usb_output {
 			$driver = $id->[15] if $id->[15];
 			$type ||= 'N/A';
 			$driver ||= 'N/A';
-			#print "pt3:$class:$product\n";
+			# print "pt3:$class:$product\n";
 			$rows[$j]->{main::key($num++,1,2,'Device')} = $bus_id;
 			$rows[$j]->{main::key($num++,0,3,'info')} = $product;
 			$rows[$j]->{main::key($num++,0,3,'type')} = $type;
@@ -18653,16 +20495,21 @@ sub usb_output {
 		# for either hub or device
 		if ($extra > 1 && main::is_numeric($id->[17])){
 			my $speed = $id->[17];
-			if ($speed >= 1000) {$speed = ($id->[17] / 1000 ) . " Gb/s"}
+			if ($speed >= 1000){$speed = ($id->[17]/1000) . " Gb/s"}
 			else {$speed = $id->[17] . " Mb/s"}
 			$rows[$j]->{main::key($num++,0,$ind_sc,'speed')} = $speed;
 		}
+		if ($extra > 2 && $id->[19] && $id->[19] ne '0mA'){
+			$rows[$j]->{main::key($num++,0,$ind_sc,'power')} = $id->[19];
+		}
 		if ($extra > 1){
-			$rows[$j]->{main::key($num++,0,$ind_sc,'chip ID')} = $chip_id;
+			$chip_id = $id->[7];
+			$chip_id ||= 'N/A';
+			$rows[$j]->{main::key($num++,0,$ind_sc,'chip-ID')} = $chip_id;
 		}
 		if ($extra > 2 && defined $id->[5] && $id->[5] ne ''){
 			my $id = sprintf("%02s",$id->[4]) . sprintf("%02s", $id->[5]);
-			$rows[$j]->{main::key($num++,0,$ind_sc,'class ID')} = $id;
+			$rows[$j]->{main::key($num++,0,$ind_sc,'class-ID')} = $id;
 		}
 		if (!$b_hub && $extra > 2){
 			if ($serial){
@@ -18670,17 +20517,16 @@ sub usb_output {
 			}
 		}
 	}
-	#print Data::Dumper::Dumper \@rows;
+	# print Data::Dumper::Dumper \@rows;
 	eval $end if $b_log;
 	return @rows;
 }
 }
 
-## add metric / imperial (us) switch
-## WeatherData
+## WeatherItem
+# add metric / imperial (us) switch
 {
-package WeatherData;
-
+package WeatherItem;
 sub get {
 	eval $start if $b_log;
 	my (@rows);
@@ -18698,7 +20544,7 @@ sub weather_output {
 		my $location_string;
 		$location_string = $show{'weather-location'};
 		$location_string =~ s/\+/ /g;
-		if ( $location_string =~ /,/){
+		if ($location_string =~ /,/){
 			my @temp = split(',', $location_string);
 			my $sep = '';
 			my $string = '';
@@ -18714,19 +20560,19 @@ sub weather_output {
 	}
 	else {
 		@location = get_location();
-		if (!$location[0]) {
+		if (!$location[0]){
 			return @rows = ({
 			main::key($num++,0,1,'Message') => main::row_defaults('weather-null','current location'),
 			});
 		}
 	}
 	%weather = get_weather(\@location);
-	if ($weather{'error'}) {
+	if ($weather{'error'}){
 		return @rows = ({
 		main::key($num++,0,1,'Message') => main::row_defaults('weather-error',$weather{'error'}),
 		});
 	}
-	if (!$weather{'weather'}) {
+	if (!$weather{'weather'}){
 		return @rows = ({
 		main::key($num++,0,1,'Message') => main::row_defaults('weather-null','weather data'),
 		});
@@ -18748,15 +20594,15 @@ sub weather_output {
 			if (defined $weather{'cloud-cover'}){
 				$rows[$j]->{main::key($num++,0,2,'cloud cover')} = $weather{'cloud-cover'} . '%';
 			}
-			if ($weather{'precip-1h-mm'} && defined $weather{'precip-1h-in'} ){
+			if ($weather{'precip-1h-mm'} && defined $weather{'precip-1h-in'}){
 				$value = process_unit('',$weather{'precip-1h-mm'},'mm',$weather{'precip-1h-in'},'in');
 				$rows[$j]->{main::key($num++,0,2,'precipitation')} = $value;
 			}
-			if ($weather{'rain-1h-mm'} && defined $weather{'rain-1h-in'} ){
+			if ($weather{'rain-1h-mm'} && defined $weather{'rain-1h-in'}){
 				$value = process_unit('',$weather{'rain-1h-mm'},'mm',$weather{'rain-1h-in'},'in');
 				$rows[$j]->{main::key($num++,0,2,'rain')} = $value;
 			}
-			if ($weather{'snow-1h-mm'} && defined $weather{'snow-1h-in'} ){
+			if ($weather{'snow-1h-mm'} && defined $weather{'snow-1h-in'}){
 				$value = process_unit('',$weather{'snow-1h-mm'},'mm',$weather{'snow-1h-in'},'in');
 				$rows[$j]->{main::key($num++,0,2,'snow')} = $value;
 			}
@@ -18796,7 +20642,7 @@ sub weather_output {
 	push(@rows, {
 	main::key($num++,1,1,'Locale') => $location,
 	},);
-	if ($extra > 2 && !$use{'filter'} && ($weather{'elevation-m'} || $weather{'elevation-ft'} )){
+	if ($extra > 2 && !$use{'filter'} && ($weather{'elevation-m'} || $weather{'elevation-ft'})){
 		$rows[$j]->{main::key($num++,0,2,'altitude')} = process_elevation($weather{'elevation-m'},$weather{'elevation-ft'});
 	}
 	$rows[$j]->{main::key($num++,0,2,'current time')} = $weather{'date-time'},;
@@ -18826,18 +20672,18 @@ sub process_elevation {
 	my ($meters,$feet) = @_;
 	my ($result,$i_unit,$m_unit) = ('','ft','m');
 	$feet = sprintf("%.0f", 3.28 * $meters) if defined $meters && !$feet;
-	$meters = sprintf("%.1f", $feet / 3.28 ) if defined $feet && !$meters;
+	$meters = sprintf("%.1f", $feet/3.28) if defined $feet && !$meters;
 	$meters = sprintf("%.0f", $meters) if $meters;
-	if ( defined $meters  && $weather_unit eq 'mi' ){
+	if (defined $meters  && $weather_unit eq 'mi'){
 		$result = "$meters $m_unit ($feet $i_unit)";
 	}
-	elsif (defined $meters && $weather_unit eq 'im' ){
+	elsif (defined $meters && $weather_unit eq 'im'){
 		$result = "$feet $i_unit ($meters $m_unit)";
 	}
-	elsif (defined $meters && $weather_unit eq 'm' ){
+	elsif (defined $meters && $weather_unit eq 'm'){
 		$result = "$meters $m_unit";
 	}
-	elsif (defined $feet && $weather_unit eq 'i' ){
+	elsif (defined $feet && $weather_unit eq 'i'){
 		$result = "$feet $i_unit";
 	}
 	else {
@@ -18850,16 +20696,16 @@ sub process_unit {
 	eval $start if $b_log;
 	my ($primary,$metric,$m_unit,$imperial,$i_unit) = @_;
 	my $result = '';
-	if (defined $metric && defined $imperial && $weather_unit eq 'mi' ){
+	if (defined $metric && defined $imperial && $weather_unit eq 'mi'){
 		$result = "$metric $m_unit ($imperial $i_unit)";
 	}
-	elsif (defined $metric && defined $imperial && $weather_unit eq 'im' ){
+	elsif (defined $metric && defined $imperial && $weather_unit eq 'im'){
 		$result = "$imperial $i_unit ($metric $m_unit)";
 	}
-	elsif (defined $metric && $weather_unit eq 'm' ){
+	elsif (defined $metric && $weather_unit eq 'm'){
 		$result = "$metric $m_unit";
 	}
-	elsif (defined $imperial && $weather_unit eq 'i' ){
+	elsif (defined $imperial && $weather_unit eq 'i'){
 		$result = "$imperial $i_unit";
 	}
 	elsif ($primary){
@@ -18893,30 +20739,30 @@ sub process_wind {
 	if (!defined $mph && $primary){
 		$result = $primary;
 	}
-	elsif (defined $mph && defined $direction ){
-		if ( $weather_unit eq 'mi' ){
+	elsif (defined $mph && defined $direction){
+		if ($weather_unit eq 'mi'){
 			$result = "from $direction at $ms $m_unit ($kmh $km_unit, $mph $i_unit)";
 		}
-		elsif ( $weather_unit eq 'im' ){
+		elsif ($weather_unit eq 'im'){
 			$result = "from $direction at $mph $i_unit ($ms $m_unit, $kmh $km_unit)";
 		}
-		elsif ( $weather_unit eq 'm' ){
+		elsif ($weather_unit eq 'm'){
 			$result = "from $direction at $ms $m_unit ($kmh $km_unit)";
 		}
-		elsif ( $weather_unit eq 'i' ){
+		elsif ($weather_unit eq 'i'){
 			$result = "from $direction at $mph $i_unit";
 		}
 		if ($gust_mph){
-			if ( $weather_unit eq 'mi' ){
+			if ($weather_unit eq 'mi'){
 				$result .= ". Gusting to $ms $m_unit ($kmh $km_unit, $mph $i_unit)";
 			}
-			elsif ( $weather_unit eq 'im' ){
+			elsif ($weather_unit eq 'im'){
 				$result .= ". Gusting to $mph $i_unit ($ms $m_unit, $kmh $km_unit)";
 			}
-			elsif ( $weather_unit eq 'm' ){
+			elsif ($weather_unit eq 'm'){
 				$result .= ". Gusting to $ms $m_unit ($kmh $km_unit)";
 			}
-			elsif ( $weather_unit eq 'i' ){
+			elsif ($weather_unit eq 'i'){
 				$result .= ". Gusting to $mph $i_unit";
 			}
 		}
@@ -18942,38 +20788,38 @@ sub get_weather {
 	if (-r $file_cached){
 		@weather_data = main::reader($file_cached);
 		$freshness = (split(/\^\^/, $weather_data[0]))[1];
-		#print "$now:$freshness\n";
+		# print "$now:$freshness\n";
 	}
-	if (!$freshness || $freshness < ($now - 60) ) {
+	if (!$freshness || $freshness < ($now - 60)){
 		@weather_data = download_weather($now,$file_cached,$location);
 	}
-	#print join("\n", @weather_data), "\n";
+	# print join("\n", @weather_data), "\n";
 	# NOTE: because temps can be 0, we can't do if value tests
 	foreach (@weather_data){
 		my @working = split(/\s*\^\^\s*/, $_);
 		next if ! defined $working[1] || $working[1] eq '';
-		if ( $working[0] eq 'api_source' ){
+		if ($working[0] eq 'api_source'){
 			$weather{'api-source'} = $working[1];
 		}
-		elsif ( $working[0] eq 'city' ){
+		elsif ($working[0] eq 'city'){
 			$weather{'city'} = $working[1];
 		}
-		elsif ( $working[0] eq 'cloud_cover' ){
+		elsif ($working[0] eq 'cloud_cover'){
 			$weather{'cloud-cover'} = $working[1];
 		}
-		elsif ( $working[0] eq 'country' ){
+		elsif ($working[0] eq 'country'){
 			$weather{'country'} = $working[1];
 		}
-		elsif ( $working[0] eq 'dewpoint_string' ){
+		elsif ($working[0] eq 'dewpoint_string'){
 			$weather{'dewpoint'} = $working[1];
 			$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
 			$weather{'dewpoint-c'} = $2;;
 			$weather{'dewpoint-f'} = $1;;
 		}
-		elsif ( $working[0] eq 'dewpoint_c' ){
+		elsif ($working[0] eq 'dewpoint_c'){
 			$weather{'dewpoint-c'} = $working[1];
 		}
-		elsif ( $working[0] eq 'dewpoint_f' ){
+		elsif ($working[0] eq 'dewpoint_f'){
 			$weather{'dewpoint-f'} = $working[1];
 		}
 		# WU: there are two elevations, we want the first one
@@ -18982,81 +20828,81 @@ sub get_weather {
 			$weather{'elevation-m'} = $working[1];
 			$weather{'elevation-m'} =~ s/\s*(ft|m).*$//;
 		}
-		elsif ( $working[0] eq 'error' ){
+		elsif ($working[0] eq 'error'){
 			$weather{'error'} = $working[1];
 		}
-		elsif ( $working[0] eq 'forecast' ){
+		elsif ($working[0] eq 'forecast'){
 			$weather{'forecast'} = $working[1];
 		}
-		elsif ( $working[0] eq 'heat_index_string' ){
+		elsif ($working[0] eq 'heat_index_string'){
 			$weather{'heat-index'} = $working[1];
 			$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
 			$weather{'heat-index-c'} = $2;;
 			$weather{'heat-index-f'} = $1;
 		}
-		elsif ( $working[0] eq 'heat_index_c' ){
+		elsif ($working[0] eq 'heat_index_c'){
 			$weather{'heat-index-c'} = $working[1];
 		}
-		elsif ( $working[0] eq 'heat_index_f' ){
+		elsif ($working[0] eq 'heat_index_f'){
 			$weather{'heat-index-f'} = $working[1];
 		}
-		elsif ( $working[0] eq 'relative_humidity' ){
+		elsif ($working[0] eq 'relative_humidity'){
 			$working[1] =~ s/%$//;
 			$weather{'humidity'} = $working[1];
 		}
-		elsif ( $working[0] eq 'local_time' ){
+		elsif ($working[0] eq 'local_time'){
 			$weather{'local-time'} = $working[1];
 		}
-		elsif ( $working[0] eq 'local_epoch' ){
+		elsif ($working[0] eq 'local_epoch'){
 			$weather{'local-epoch'} = $working[1];
 		}
-		elsif ( $working[0] eq 'moonphase' ){
+		elsif ($working[0] eq 'moonphase'){
 			$weather{'moonphase'} = $working[1];
 		}
-		elsif ( $working[0] eq 'moonphase_graphic' ){
+		elsif ($working[0] eq 'moonphase_graphic'){
 			$weather{'moonphase-graphic'} = $working[1];
 		}
-		elsif ( $working[0] eq 'observation_time_rfc822' ){
+		elsif ($working[0] eq 'observation_time_rfc822'){
 			$weather{'observation-time-rfc822'} = $working[1];
 		}
-		elsif ( $working[0] eq 'observation_epoch' ){
+		elsif ($working[0] eq 'observation_epoch'){
 			$weather{'observation-epoch'} = $working[1];
 		}
-		elsif ( $working[0] eq 'observation_time' ){
+		elsif ($working[0] eq 'observation_time'){
 			$weather{'observation-time-local'} = $working[1];
 			$weather{'observation-time-local'} =~ s/Last Updated on //;
 		}
-		elsif ( $working[0] eq 'precip_mm' ){
+		elsif ($working[0] eq 'precip_mm'){
 			$weather{'precip-1h-mm'} = $working[1];
 		}
-		elsif ( $working[0] eq 'precip_in' ){
+		elsif ($working[0] eq 'precip_in'){
 			$weather{'precip-1h-in'} = $working[1];
 		}
-		elsif ( $working[0] eq 'pressure_string' ){
+		elsif ($working[0] eq 'pressure_string'){
 			$weather{'pressure'} = $working[1];
 		}
-		elsif ( $working[0] eq 'pressure_mb' ){
+		elsif ($working[0] eq 'pressure_mb'){
 			$weather{'pressure-mb'} = $working[1];
 		}
-		elsif ( $working[0] eq 'pressure_in' ){
+		elsif ($working[0] eq 'pressure_in'){
 			$weather{'pressure-in'} = $working[1];
 		}
-		elsif ( $working[0] eq 'rain_1h_mm' ){
+		elsif ($working[0] eq 'rain_1h_mm'){
 			$weather{'rain-1h-mm'} = $working[1];
 		}
-		elsif ( $working[0] eq 'rain_1h_in' ){
+		elsif ($working[0] eq 'rain_1h_in'){
 			$weather{'rain-1h-in'} = $working[1];
 		}
-		elsif ( $working[0] eq 'snow_1h_mm' ){
+		elsif ($working[0] eq 'snow_1h_mm'){
 			$weather{'snow-1h-mm'} = $working[1];
 		}
-		elsif ( $working[0] eq 'snow_1h_in' ){
+		elsif ($working[0] eq 'snow_1h_in'){
 			$weather{'snow-1h-in'} = $working[1];
 		}
-		elsif ( $working[0] eq 'state_name' ){
+		elsif ($working[0] eq 'state_name'){
 			$weather{'state'} = $working[1];
 		}
-		elsif ( $working[0] eq 'sunrise' ){
+		elsif ($working[0] eq 'sunrise'){
 			if ($working[1]){
 				if ($working[1] !~ /^[0-9]+$/){
 					$weather{'sunrise'} = $working[1];
@@ -19067,7 +20913,7 @@ sub get_weather {
 				}
 			}
 		}
-		elsif ( $working[0] eq 'sunset' ){
+		elsif ($working[0] eq 'sunset'){
 			if ($working[1]){
 				if ($working[1] !~ /^[0-9]+$/){
 					$weather{'sunset'} = $working[1];
@@ -19078,7 +20924,7 @@ sub get_weather {
 				}
 			}
 		}
-		elsif ( $working[0] eq 'temperature_string' ){
+		elsif ($working[0] eq 'temperature_string'){
 			$weather{'temp'} = $working[1];
 			$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
 			$weather{'temp-c'} = $2;;
@@ -19087,58 +20933,58 @@ sub get_weather {
 # 			$weather{'temp'} =~ s/\sF/\x{2109}/;
 # 			$weather{'temp'} =~ s/\sC/\x{2103}/;
 		}
-		elsif ( $working[0] eq 'temp_f' ){
+		elsif ($working[0] eq 'temp_f'){
 			$weather{'temp-f'} = $working[1];
 		}
-		elsif ( $working[0] eq 'temp_c' ){
+		elsif ($working[0] eq 'temp_c'){
 			$weather{'temp-c'} = $working[1];
 		}
-		elsif ( $working[0] eq 'timezone' ){
+		elsif ($working[0] eq 'timezone'){
 			$weather{'timezone'} = $working[1];
 		}
-		elsif ( $working[0] eq 'visibility' ){
+		elsif ($working[0] eq 'visibility'){
 			$weather{'visibility'} = $working[1];
 		}
-		elsif ( $working[0] eq 'visibility_km' ){
+		elsif ($working[0] eq 'visibility_km'){
 			$weather{'visibility-km'} = $working[1];
 		}
-		elsif ( $working[0] eq 'visibility_mi' ){
+		elsif ($working[0] eq 'visibility_mi'){
 			$weather{'visibility-mi'} = $working[1];
 		}
-		elsif ( $working[0] eq 'weather' ){
+		elsif ($working[0] eq 'weather'){
 			$weather{'weather'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_degrees' ){
+		elsif ($working[0] eq 'wind_degrees'){
 			$weather{'wind-degrees'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_dir' ){
+		elsif ($working[0] eq 'wind_dir'){
 			$weather{'wind-direction'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_mph' ){
+		elsif ($working[0] eq 'wind_mph'){
 			$weather{'wind-mph'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_gust_mph' ){
+		elsif ($working[0] eq 'wind_gust_mph'){
 			$weather{'wind-gust-mph'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_gust_ms' ){
+		elsif ($working[0] eq 'wind_gust_ms'){
 			$weather{'wind-gust-ms'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_ms' ){
+		elsif ($working[0] eq 'wind_ms'){
 			$weather{'wind-ms'} = $working[1];
 		}
-		elsif ( $working[0] eq 'wind_string' ){
+		elsif ($working[0] eq 'wind_string'){
 			$weather{'wind'} = $working[1];
 		}
-		elsif ( $working[0] eq 'windchill_string' ){
+		elsif ($working[0] eq 'windchill_string'){
 			$weather{'windchill'} = $working[1];
 			$working[1] =~ /^([0-9\.]+)\sF\s\(([0-9\.]+)\sC\)/;
 			$weather{'windchill-c'} = $2;
 			$weather{'windchill-f'} = $1;
 		}
-		elsif ( $working[0] eq 'windchill_c' ){
+		elsif ($working[0] eq 'windchill_c'){
 			$weather{'windchill-c'} = $working[1];
 		}
-		elsif ( $working[0] eq 'windchill_f' ){
+		elsif ($working[0] eq 'windchill_f'){
 			$weather{'windchill_f'} = $working[1];
 		}
 	}
@@ -19167,11 +21013,11 @@ sub get_weather {
 	else {
 		$date_time = POSIX::strftime "%c", localtime();
 		$date_time = test_locale_date($date_time,'','');
-		$tz = ( $location->[2] ) ? " ($location->[2])" : ''; 
+		$tz = ($location->[2]) ? " ($location->[2])" : ''; 
 		$weather{'date-time'} = $date_time . $tz;
 	}
 	# we get the wrong time using epoch for remote -W location
-	if ( !$show{'weather-location'} && $weather{'observation-epoch'}){
+	if (!$show{'weather-location'} && $weather{'observation-epoch'}){
 		$date_time = POSIX::strftime "%c", localtime($weather{'observation-epoch'});
 		$date_time = test_locale_date($date_time,$show{'weather-location'},$weather{'observation-epoch'});
 		$weather{'observation-time-local'} = $date_time;
@@ -19186,7 +21032,7 @@ sub download_weather {
 	$url = "https://smxi.org/opt/xr2.php?loc=$location->[0]&src=$weather_source";
 	$ua = 'weather';
 # 		{
-# 			#my $file2 = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/weather-1.xml";
+# 			# my $file2 = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/weather-1.xml";
 # 			# my $file2 = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/feed-oslo-1.xml";
 # 			local $/;
 # 			my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/weather/weather-1.xml";
@@ -19197,7 +21043,7 @@ sub download_weather {
 	@weather = split('\n', $temp) if $temp;
 	unshift(@weather, "timestamp^^$now");
 	main::writer($file_cached,\@weather);
-	#print "$file_cached: download/cleaned\n";
+	# print "$file_cached: download/cleaned\n";
 	eval $end if $b_log;
 	return @weather;
 }
@@ -19206,7 +21052,7 @@ sub download_weather {
 sub test_locale_date {
 	my ($date_time,$location,$epoch) = @_;
 	# $date_time .= 'дек';
-	#print "1: $date_time\n";
+	# print "1: $date_time\n";
 	if ($date_time =~ m/[^\x00-\x7f]/){
 		if (!$location && $epoch){
 			$date_time = POSIX::strftime "%Y-%m-%d %H:%M:%S", localtime($epoch);
@@ -19216,7 +21062,7 @@ sub test_locale_date {
 		}
 	}
 	$date_time =~ s/\s+$//;
-	#print "2: $date_time\n";
+	# print "2: $date_time\n";
 	return $date_time;
 }
 sub get_location {
@@ -19228,7 +21074,7 @@ sub get_location {
 		@loc_data = main::reader($file_cached);
 		$freshness = (split(/\^\^/, $loc_data[0]))[1];
 	}
-	if (!$freshness || $freshness < $now - 90) {
+	if (!$freshness || $freshness < $now - 90){
 		my $temp;
 		my $url = "http://geoip.ubuntu.com/lookup";
 # 		{
@@ -19249,43 +21095,43 @@ sub get_location {
 		@loc_data = split('\n', $loc_data[0]);
 		unshift(@loc_data, "timestamp^^$now");
 		main::writer($file_cached,\@loc_data);
-		#print "$file_cached: download/cleaned\n";
+		# print "$file_cached: download/cleaned\n";
 	}
 	foreach (@loc_data){
 		my @working = split(/\s*\^\^\s*/, $_);
-		#print "$working[0]:$working[1]\n";
-		if ($working[0] eq 'CountryCode3' ) {
+		# print "$working[0]:$working[1]\n";
+		if ($working[0] eq 'CountryCode3'){
 			$loc{'country3'} = $working[1];
 		}
-		elsif ($working[0] eq 'CountryCode' ) {
+		elsif ($working[0] eq 'CountryCode'){
 			$loc{'country'} = $working[1];
 		}
-		elsif ($working[0] eq 'CountryName' ) {
+		elsif ($working[0] eq 'CountryName'){
 			$loc{'country2'} = $working[1];
 		}
-		elsif ($working[0] eq 'RegionCode' ) {
+		elsif ($working[0] eq 'RegionCode'){
 			$loc{'region-id'} = $working[1];
 		}
-		elsif ($working[0] eq 'RegionName' ) {
+		elsif ($working[0] eq 'RegionName'){
 			$loc{'region'} = $working[1];
 		}
-		elsif ($working[0] eq 'City' ) {
+		elsif ($working[0] eq 'City'){
 			$loc{'city'} = $working[1];
 		}
-		elsif ($working[0] eq 'ZipPostalCode' ) {
+		elsif ($working[0] eq 'ZipPostalCode'){
 			$loc{'zip'} = $working[1];
 		}
-		elsif ($working[0] eq 'Latitude' ) {
+		elsif ($working[0] eq 'Latitude'){
 			$loc{'lat'} = $working[1];
 		}
-		elsif ($working[0] eq 'Longitude' ) {
+		elsif ($working[0] eq 'Longitude'){
 			$loc{'long'} = $working[1];
 		}
-		elsif ($working[0] eq 'TimeZone' ) {
+		elsif ($working[0] eq 'TimeZone'){
 			$loc{'tz'} = $working[1];
 		}
 	}
-	#print Data::Dumper::Dumper \%loc;
+	# print Data::Dumper::Dumper \%loc;
 	# assign location, cascade from most accurate
 	# latitude,longitude first
 	if ($loc{'lat'} && $loc{'long'}){
@@ -19304,7 +21150,7 @@ sub get_location {
 	$state = ($loc{'region-id'}) ? $loc{'region-id'} : 'Region N/A';
 	$loc_string = main::apply_filter("$city, $state, $country");
 	my @location = ($loc_arg,$loc_string,$loc{'tz'});
-	#print ($loc_arg,"\n", join("\n", @loc_data), "\n",scalar @loc_data, "\n");
+	# print ($loc_arg,"\n", join("\n", @loc_data), "\n",scalar @loc_data, "\n");
 	eval $end if $b_log;
 	return @location;
 }
@@ -19322,61 +21168,126 @@ sub complete_location {
 }
 
 #### -------------------------------------------------------------------
-#### UTILITIES FOR DATA LINES
+#### ITEM UTILITIES
 #### -------------------------------------------------------------------
 
-sub get_compiler_version {
+# android only, for distro / OS id and machine data
+sub set_build_prop {
+	eval $start if $b_log;
+	my $path = '/system/build.prop';
+	$loaded{'build-prop'} = 1;
+	return if ! -r $path;
+	my @data = reader($path,'strip');
+	foreach (@data){
+		my @working = split('=', $_);
+		next if $working[0] !~ /^ro\.(build|product)/;
+		if ($working[0] eq 'ro.build.date.utc'){
+			$build_prop{'build-date'} = strftime "%F", gmtime($working[1]);
+		}
+		# ldgacy, replaced by ro.product.device
+		elsif ($working[0] eq 'ro.build.product'){
+			$build_prop{'build-product'} = $working[1];
+		}
+		# this can be brand, company, android, it varies, but we don't want android value
+		elsif ($working[0] eq 'ro.build.user'){
+			$build_prop{'build-user'} = $working[1] if $working[1] !~ /android/i;
+		}
+		elsif ($working[0] eq 'ro.build.version.release'){
+			$build_prop{'build-version'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.board'){
+			$build_prop{'product-board'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.brand'){
+			$build_prop{'product-brand'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.device'){
+			$build_prop{'product-device'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.manufacturer'){
+			$build_prop{'product-manufacturer'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.model'){
+			$build_prop{'product-model'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.name'){
+			$build_prop{'product-name'} = $working[1];
+		}
+		elsif ($working[0] eq 'ro.product.screensize'){
+			$build_prop{'product-screensize'} = $working[1];
+		}
+	}
+	log_data('dump','%build_prop',\%build_prop) if $b_log;
+	print Dumper \%build_prop if $dbg[20];
+	eval $end if $b_log;
+}
+
+## CompilerVersion
+{
+package CompilerVersion;
+sub get {
 	eval $start if $b_log;
 	my (@compiler);
-	if (my $file = system_files('version') ) {
-		@compiler = get_compiler_version_linux($file);
+	if (my $file = $system_files{'proc-version'}){
+		@compiler = version_proc($file);
 	}
-	elsif ($bsd_type) {
-		@compiler = get_compiler_version_bsd();
+	elsif ($bsd_type){
+		@compiler = version_bsd();
 	}
 	eval $end if $b_log;
 	return @compiler;
 }
 
-sub get_compiler_version_bsd {
+sub version_bsd {
 	eval $start if $b_log;
 	my (@compiler,@working);
 	if ($alerts{'sysctl'}->{'action'} && $alerts{'sysctl'}->{'action'} eq 'use'){
-		# for dragonfly, we will use free mem, not used because free is 0
-		my @working;
-		foreach (@sysctl){
-			# freebsd seems to use bytes here
-			# Not every line will have a : separator though the processor should make 
-			# most have it. This appears to be 10.x late feature add, I don't see it
-			# on earlier BSDs
-			if (/^kern.compiler_version/){
-				@working = split(/:\s*/, $_);
-				$working[1] =~ /.*(gcc|clang)\sversion\s([\S]+)\s.*/;
-				@compiler = ($1,$2);
-				last;
+		if ($sysctl{'kernel'}){
+			my @working;
+			foreach (@{$sysctl{'kernel'}}){
+				# Not every line will have a : separator though the processor should make 
+				# most have it. This appears to be 10.x late feature add, I don't see it
+				# on earlier BSDs
+				if (/^kern.compiler_version/){
+					@working = split(/:\s*/, $_);
+					$working[1] =~ /.*(gcc|clang)\sversion\s([\S]+)\s.*/;
+					@compiler = ($1,$2);
+					last;
+				}
+			}
+		}
+		# OpenBSD doesn't show compiler data in sysctl or dboot but it's going to
+		# be Clang until way into the future, and it will be the installed version.
+		if (!@compiler){
+			if (my $path = main::check_program('clang')){
+				 $compiler[0] = 'clang';
+				 $compiler[1] = main::program_version($path,'clang',3,'--version');
 			}
 		}
 	}
-	log_data('dump','@compiler',\@compiler) if $b_log;
+	main::log_data('dump','@compiler',\@compiler) if $b_log;
 	eval $end if $b_log;
 	return @compiler;
 }
-
-sub get_compiler_version_linux {
+sub version_proc {
 	eval $start if $b_log;
 	my ($file) = @_;
 	my (@compiler,$version);
-	my @data = reader($file);
+	my @data = main::reader($file);
 	my $result = $data[0] if @data;
 	if ($result){
-		# $result = $result =~ /\*(gcc|clang)\*eval\*/;
-		# $result='Linux version 5.4.0-rc1 (sourav@archlinux-pc) (clang version 9.0.0 (tags/RELEASE_900/final)) #1 SMP PREEMPT Sun Oct 6 18:02:41 IST 2019';
-		#$result='Linux version 5.8.3-fw1 (fst@x86_64.frugalware.org) ( OpenMandriva 11.0.0-0.20200819.1 clang version 11.0.0 (/builddir/build/BUILD/llvm-project-release-11.x/clang 2a0076812cf106fcc34376d9d967dc5f2847693a), LLD 11.0.0)';
-		#$result='Linux version 5.8.0-18-generic (buildd@lgw01-amd64-057) (gcc (Ubuntu 10.2.0-5ubuntu2) 10.2.0, GNU ld (GNU Binutils for Ubuntu) 2.35) #19-Ubuntu SMP Wed Aug 26 15:26:32 UTC 2020';
-		# $result='Linux version 5.8.9-fw1 (fst@x86_64.frugalware.org) (gcc (Frugalware Linux) 9.2.1 20200215, GNU ld (GNU Binutils) 2.35) #1 SMP PREEMPT Tue Sep 15 16:38:57 CEST 2020';
-		# $result='Linux version 5.8.0-2-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.0-9) 10.2.0, GNU ld (GNU Binutils for Debian) 2.35) #1 SMP Debian 5.8.10-1 (2020-09-19)';
-		 $result='Linux version 5.9.0-5-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.1-1) 10.2.1 20201207, GNU ld (GNU Binutils for Debian) 2.35.1) #1 SMP Debian 5.9.15-1 (2020-12-17)';
-		if ($result =~ /(gcc|clang).*version\s([\S]+)/){
+		if ($fake{'compiler'}){
+			# $result = $result =~ /\*(gcc|clang)\*eval\*/;
+			# $result='Linux version 5.4.0-rc1 (sourav@archlinux-pc) (clang version 9.0.0 (tags/RELEASE_900/final)) #1 SMP PREEMPT Sun Oct 6 18:02:41 IST 2019';
+			# $result='Linux version 5.8.3-fw1 (fst@x86_64.frugalware.org) ( OpenMandriva 11.0.0-0.20200819.1 clang version 11.0.0 (/builddir/build/BUILD/llvm-project-release-11.x/clang 2a0076812cf106fcc34376d9d967dc5f2847693a), LLD 11.0.0)';
+			# $result='Linux version 5.8.0-18-generic (buildd@lgw01-amd64-057) (gcc (Ubuntu 10.2.0-5ubuntu2) 10.2.0, GNU ld (GNU Binutils for Ubuntu) 2.35) #19-Ubuntu SMP Wed Aug 26 15:26:32 UTC 2020';
+			# $result='Linux version 5.8.9-fw1 (fst@x86_64.frugalware.org) (gcc (Frugalware Linux) 9.2.1 20200215, GNU ld (GNU Binutils) 2.35) #1 SMP PREEMPT Tue Sep 15 16:38:57 CEST 2020';
+			# $result='Linux version 5.8.0-2-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.0-9) 10.2.0, GNU ld (GNU Binutils for Debian) 2.35) #1 SMP Debian 5.8.10-1 (2020-09-19)';
+			# $result='Linux version 5.9.0-5-amd64 (debian-kernel@lists.debian.org) (gcc-10 (Debian 10.2.1-1) 10.2.1 20201207, GNU ld (GNU Binutils for Debian) 2.35.1) #1 SMP Debian 5.9.15-1 (2020-12-17)';
+			# $result='Linux version 2.6.1 (GNU 0.9 GNU-Mach 1.8+git20201007-486/Hurd-0.9 i686-AT386)';
+			# $result='NetBSD version 9.1 (netbsd@localhost) (gcc version 7.5.0) NetBSD 9.1 (GENERIC) #0: Sun Oct 18 19:24:30 UTC 2020';
+		}
+		if ($result =~ /(gcc|clang).*version\s([^\s\)]+)/){
 			$version = $2;
 			$version ||= 'N/A'; 
 			@compiler = ($1,$version);
@@ -19387,13 +21298,193 @@ sub get_compiler_version_linux {
 			@compiler = ($1,$version);
 		}
 	}
-	log_data('dump','@compiler',\@compiler) if $b_log;
+	main::log_data('dump','@compiler',\@compiler) if $b_log;
 	eval $end if $b_log;
 	return @compiler;
 }
+}
 
-## Get DesktopEnvironment
-## returns array:
+sub set_dboot_data {
+	eval $start if $b_log;
+	$loaded{'dboot'} = 1;
+	my ($file,@db_data,@dm_data,@temp);
+	my ($counter) = (0);
+	if (!$fake{'dboot'}){
+		$file = $system_files{'dmesg-boot'};
+	}
+	else {
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/bsd-disks-diabolus.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-disks-solestar.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-enceladus-1.txt";
+		## matches: toshiba: openbsd-5.6-sysctl-2.txt
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-5.6-dmesg.boot-1.txt";
+		## matches: compaq: openbsd-5.6-sysctl-1.txt"
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-dmesg.boot-1.txt";
+		$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-6.8-battery-sensors-1.txt";
+	}
+	if ($file){
+		return if ! -r $file;
+		@db_data = reader($file);
+		# sometimes > 1 sessions stored, dump old ones
+		for (@db_data){
+			if (/^(Dragonfly|OpenBSD|NetBSD|FreeBSD is a registered trademark|Copyright.*Midnight)/){
+				$counter++;
+				undef @temp if $counter > 1; 
+			}
+			push(@temp,$_);
+		}
+		@db_data = @temp;
+		undef @temp; 
+		my @dm_data = grabber('dmesg 2>/dev/null');
+		# clear out for netbsd, only 1 space following or lines won't match
+		@dm_data = map {$_ =~ s/^\[[^\]]+\]\s//;$_} @dm_data;
+		$counter = 0;
+		# dump previous sessions, and also everything roughly before dmesg.boot 
+		# ends, it does't need to be perfect, we just only want the actual post 
+		# boot data
+		for (@dm_data){
+			if (/^(Dragonfly|OpenBSD|NetBSD|FreeBSD is a registered trademark|Copyright.*Midnight)/ ||
+				/^(smbus[0-9]:|Security policy loaded|root on)/){
+				$counter++;
+				undef @temp if $counter > 1; 
+			}
+			push(@temp,$_);
+		}
+		@dm_data = @temp;
+		undef @temp; 
+		push(@db_data,'~~~~~',@dm_data);
+		# uniq(\@db_data); # get rid of duplicate lines
+		# some dmesg repeats, so we need to dump the second and > iterations
+		# replace all indented items with ~ so we can id them easily while
+		# processing note that if user, may get error of read permissions
+		# for some weird reason, real mem and avail mem are use a '=' separator, 
+		# who knows why, the others are ':'
+		foreach (@db_data){
+			$_ =~ s/\s*=\s*|:\s*/:/;
+			$_ =~ s/\"//g;
+			$_ =~ s/^\s+/~/;
+			$_ =~ s/\s\s/ /g;
+			$_ =~ s/^(\S+)\sat\s/$1:at /; # ada0 at ahcich0
+			push(@{$dboot{'main'}}, $_);
+			if ($use{'bsd-battery'} && /^acpi(bat|cmb)/){
+				push(@{$sysctl{'battery'}}, $_);
+			}
+			# ~Debug Features 0:<2 CTX BKPTs,4 Watchpoints,6 Breakpoints,PMUv3,Debugv8>
+			elsif ($use{'bsd-cpu'} && 
+			 (!/^~(Debug|Memory)/ && /(^cpu[0-9]+:|Features|^~*Origin:\s*)/)){
+				push(@{$dboot{'cpu'}}, $_);
+			}
+			# FreeBSD: 'da*' is a USB device 'ada*' is a SATA device 'mmcsd*' is an SD card
+			# OpenBSD: 'sd' is usb device, 'wd' normal drive. OpenBSD uses sd for nvme drives
+			# but also has the nvme data: 
+			# nvme1 at pci6 dev 0 function 0 vendor "Phison", unknown product 0x5012 rev 0x01: msix, NVMe 1.3
+			# nvme1: OWC Aura P12 1.0TB, firmware ECFM22.6, serial 2003100010208
+			# scsibus2 at nvme1: 2 targets, initiator 0
+			# sd1 at scsibus2 targ 1 lun 0: <NVMe, OWC Aura P12 1.0, ECFM>
+			# sd1: 915715MB, 4096 bytes/sector, 234423126 sectors
+			elsif ($use{'bsd-disk'} && 
+			 /^(ad|ada|da|mmcblk|mmcsd|nvme([0-9]+n)?|sd|wd)[0-9]+(:|\sat\s|.*?\sdetached$)/){
+				$_ =~ s/^\(//;
+				push (@{$dboot{'disk'}},$_);
+			}
+			if ($use{'bsd-machine'} && /^bios[0-9]:(at|vendor)/){
+				push(@{$sysctl{'machine'}}, $_);
+			}
+			elsif ($use{'bsd-machine'} && !$dboot{'machine-vm'} && 
+			 /(\bhvm\b|innotek|\bkvm\b|microsoft.*virtual machine|openbsd[\s-]vmm|qemu|qumranet|vbox|virtio|virtualbox|vmware)/i){
+				push(@{$dboot{'machine-vm'}}, $_);
+			}
+			elsif ($use{'bsd-optical'} && /^(cd)[0-9]+(\([^)]+\))?(:|\sat\s)/){
+				push(@{$dboot{'optical'}},$_);
+			}
+			elsif ($use{'bsd-pci'} && /^(pci[0-9]+:at|\S+:at pci)/){
+				push(@{$dboot{'pci'}},$_);
+			}
+			elsif ($use{'bsd-ram'} && /(^spdmem)/){
+				push(@{$dboot{'ram'}}, $_);
+			}
+		}
+		log_data('dump','$dboot{main}',$dboot{'main'}) if $b_log;
+		print Dumper $dboot{'main'} if $dbg[11];
+		
+		if ($dboot{'main'} && $b_log){
+			log_data('dump','$dboot{cpu}',$dboot{'cpu'});
+			log_data('dump','$dboot{disk}',$dboot{'disk'});
+			log_data('dump','$dboot{machine-vm}',$dboot{'machine-vm'});
+			log_data('dump','$dboot{optical}',$dboot{'optical'});
+			log_data('dump','$dboot{ram}',$dboot{'ram'});
+			log_data('dump','$dboot{usb}',$dboot{'usb'});
+			log_data('dump','$sysctl{battery}',$sysctl{'battery'});
+			log_data('dump','$sysctl{machine}',$sysctl{'machine'});
+		}
+		if ($dboot{'main'} && $dbg[11]){
+			print("cpu:\n", Dumper $dboot{'cpu'});
+			print("disk:\n", Dumper $dboot{'disk'});
+			print("machine vm:\n", Dumper $dboot{'machine-vm'});
+			print("optical:\n", Dumper $dboot{'optical'});
+			print("ram:\n", Dumper $dboot{'ram'});
+			print("usb:\n", Dumper $dboot{'usb'});
+			print("sys battery:\n", Dumper $sysctl{'battery'});
+			print("sys machine:\n", Dumper $sysctl{'machine'});
+		}
+		# this should help get rid of dmesg usb mounts not present
+		# note if you take out one, put in another, it will always show the first 
+		# one, I think. Not great. Not using this means all drives attached
+		# current session are shown, using it, possibly wrong drive shown, which is bad
+		# not using this for now: && (my @disks = grep {/^hw\.disknames/} @{$dboot{'disk'}}
+		if ($dboot{'disk'}){
+			# hw.disknames:sd0:,sd1:3242432,sd2:
+			#$disks[0] =~ s/(^hw\.disknames:|:[^,]*)//g; 
+			#@disks = split(',',$disks[0]) if $disks[0];
+			my ($id,$value,%dboot_disks,@disks_live,@temp);
+			# first, since openbsd has this, let's use it
+			foreach (@{$dboot{'disk'}}){
+				if (!@disks_live && /^hw\.disknames/){
+					$_ =~ s/(^hw\.disknames:|:[^,]*)//g; 
+					@disks_live = split(/[,\s]/,$_) if $_;
+				}
+				else {
+					push(@temp,$_);
+				}
+			}
+			@{$dboot{'disk'}} = @temp if @temp;
+			foreach my $row (@temp){
+				$row =~ /^([^:\s]+)[:\s]+(.+)/;
+				$id = $1;
+				$value = $2;
+				push(@{$dboot_disks{$id}},$value);
+				# get rid of detached or non present drives
+				if ((@disks_live && !(grep {$id =~ /^$_/} @disks_live)) || 
+				 $value =~ /\b(destroyed|detached)$/){
+					delete $dboot_disks{$id};
+				}
+			}
+			$dboot{'disk'} = \%dboot_disks;
+			log_data('dump','post: $dboot{disk}',$dboot{'disk'}) if $b_log;
+			print("post: disk:\n",Dumper $dboot{'disk'}) if $dbg[11];
+		}
+		if ($use{'bsd-pci'} && $dboot{'pci'}){
+			my $bus_id = 0;
+			foreach (@{$dboot{'pci'}}){
+				if (/^pci[0-9]+:at.*?bus\s([0-9]+)/){
+					$bus_id = $1;
+					next;
+				}
+				elsif (/:at pci[0-9]+\sdev/){
+					$_ =~ s/^(\S+):at.*?dev\s([0-9]+)\sfunction\s([0-9]+)\s/$bus_id:$2:$3:$1:/;
+					push(@temp,$_);
+				}
+			}
+			$dboot{'pci'} = [@temp];
+			log_data('dump','$dboot{pci}',$dboot{'pci'}) if $b_log;
+			print("pci:\n",Dumper $dboot{'pci'}) if $dbg[11];
+		}
+	}
+	eval $end if $b_log;
+}
+
+## DesktopEnvironment
+# returns array:
 # 0 - desktop name
 # 1 - version
 # 2 - toolkit
@@ -19408,7 +21499,7 @@ $xdg_desktop,@desktop,@data,@xprop);
 sub get {
 	eval $start if $b_log;
 	set_desktop_values();
-	main::set_ps_gui() if ! $b_ps_gui;
+	main::set_ps_gui() if !$loaded{'ps-gui'};
 	get_kde_trinity_data();
 	if (!@desktop){
 		get_env_de_data();
@@ -19416,7 +21507,7 @@ sub get {
 	if (!@desktop){
 		get_env_xprop_gnome_based_data();
 	}
-	if (!@desktop && $b_xprop ){
+	if (!@desktop && $b_xprop){
 		get_env_xprop_non_gnome_based_data();
 	}
 	if (!@desktop){
@@ -19425,7 +21516,7 @@ sub get {
 	if ($extra > 2 && @desktop){
 		set_info_data();
 	}
-	if ($b_display && !$b_force_display && $extra > 1){
+	if ($b_display && !$force{'display'} && $extra > 1){
 		get_wm();
 	}
 	set_gtk_data() if $b_gtk && $extra > 1;
@@ -19438,11 +21529,11 @@ sub get {
 sub set_desktop_values {
 	# NOTE $XDG_CURRENT_DESKTOP envvar is not reliable, but it shows certain desktops better.
 	# most desktops are not using it as of 2014-01-13 (KDE, UNITY, LXDE. Not Gnome)
-	$desktop_session = ( $ENV{'DESKTOP_SESSION'} ) ? prep_desktop_value($ENV{'DESKTOP_SESSION'}) : '';
-	$xdg_desktop = ( $ENV{'XDG_CURRENT_DESKTOP'} ) ? prep_desktop_value($ENV{'XDG_CURRENT_DESKTOP'}) : '';
+	$desktop_session = ($ENV{'DESKTOP_SESSION'}) ? prep_desktop_value($ENV{'DESKTOP_SESSION'}) : '';
+	$xdg_desktop = ($ENV{'XDG_CURRENT_DESKTOP'}) ? prep_desktop_value($ENV{'XDG_CURRENT_DESKTOP'}) : '';
 	$kde_session_version = ($ENV{'KDE_SESSION_VERSION'}) ? $ENV{'KDE_SESSION_VERSION'} : '';
 	# for fallback to fallback protections re false gnome id
-	$gdmsession = ( $ENV{'GDMSESSION'} ) ? prep_desktop_value($ENV{'GDMSESSION'}) : '';
+	$gdmsession = ($ENV{'GDMSESSION'}) ? prep_desktop_value($ENV{'GDMSESSION'}) : '';
 }
 # note: an ubuntu regresssion replaces or adds 'ubuntu' string to 
 # real value. Since ubuntu is the only distro I know that does this, 
@@ -19454,9 +21545,18 @@ sub prep_desktop_value {
 }
 sub get_kde_trinity_data {
 	eval $start if $b_log;
-	my ($program,@version_data,@version_data2);
+	my ($kded,$kded_name,$program,@version_data,@version_data2);
 	my $kde_full_session = ($ENV{'KDE_FULL_SESSION'}) ? $ENV{'KDE_FULL_SESSION'} : '';
-	if ($desktop_session eq 'trinity' || $xdg_desktop eq 'trinity' || (grep {/^tde/} @ps_gui) ){
+	# we can't rely on 3 using kded3, it could be kded
+	if ($kde_full_session && ($program = main::check_program('kded' . $kde_full_session))){
+		$kded = $program;
+		$kded_name = 'kded' . $kde_full_session;
+	}
+	elsif ($program = main::check_program('kded')){
+		$kded = $program;
+		$kded_name = 'kded';
+	}
+	if ($desktop_session eq 'trinity' || $xdg_desktop eq 'trinity' || (grep {/^tde/} @ps_gui)){
 		$desktop[0] = 'Trinity';
 		if ($program = main::check_program('kdesktop')){
 			@version_data = main::grabber("$program --version 2>/dev/null");
@@ -19471,15 +21571,15 @@ sub get_kde_trinity_data {
 	# KDE_SESSION_VERSION is the integer version of the desktop
 	# NOTE: as of plasma 5, the tool: about-distro MAY be available, that will show
 	# actual desktop data, so once that's in debian/ubuntu, if it gets in, add that test
-	elsif ( $xdg_desktop eq 'kde' || $kde_session_version ){
+	elsif ($xdg_desktop eq 'kde' || $kde_session_version){
 		if ($kde_session_version && $kde_session_version <= 4){
-			@data = main::program_values("kded$kde_session_version");
+			@data = ($kded_name) ? main::program_values($kded_name) : ();
 			if (@data){
 				$desktop[0] = $data[3];
-				$desktop[1] = main::program_version("kded$kde_session_version",$data[0],$data[1],$data[2],$data[5],$data[6]);
+				$desktop[1] = main::program_version($kded,$data[0],$data[1],$data[2],$data[5],$data[6]);
 				# kded exists, so we can now get the qt data string as well
-				if ($desktop[1] && ($program = main::check_program("kded$kde_session_version")) ){
-					@version_data = main::grabber("$program --version 2>/dev/null");
+				if ($desktop[1] && $kded){
+					@version_data = main::grabber("$kded --version 2>/dev/null");
 				}
 			}
 			$desktop[0] = 'KDE' if !$desktop[0];
@@ -19492,12 +21592,16 @@ sub get_kde_trinity_data {
 			# KDE Frameworks: 5.11.0
 			# kf5-config: 1.0
 			# for QT, and Frameworks if we use it
-			if (!@version_data && ($program = main::check_program("kf$kde_session_version-config") )){
+			if (!@version_data && ($program = main::check_program("kf$kde_session_version-config"))){
 				@version_data = main::grabber("$program --version 2>/dev/null");
 			}
-			if (!@version_data && ($program = main::check_program("kded$kde_session_version"))){
+			if (!@version_data && ($program = main::check_program("kf-config"))){
 				@version_data = main::grabber("$program --version 2>/dev/null");
 			}
+			# hope we don't use this fallback, not the same version as kde always
+			if (!@version_data && $kded){
+				@version_data = main::grabber("$kded --version 2>/dev/null");
+			}
 			if ($program = main::check_program("plasmashell")){
 				@version_data2 = main::grabber("$program --version 2>/dev/null");
 				$desktop[1] = main::awk(\@version_data2,'^plasmashell',-1,'\s+');
@@ -19524,7 +21628,7 @@ sub get_kde_trinity_data {
 	}
 	# KDE_FULL_SESSION property is only available since KDE 3.5.5.
 	elsif ($kde_full_session eq 'true'){
-		@version_data = main::grabber("kded --version 2>/dev/null");
+		@version_data = ($kded) ? main::grabber("$kded --version 2>/dev/null") : ();
 		$desktop[0] = 'KDE';
 		$desktop[1] = main::awk(\@version_data,'^KDE:',2,'\s+') if @version_data;
 		if (!$desktop[1]){
@@ -19558,16 +21662,18 @@ sub get_env_de_data {
 		[0,'cinnamon','cinnamon',1,0],
 		# these so far have no cli version data
 		[1,'deepin','deepin',0,1], # version comes from file read
+		[1,'leftwm','leftwm',0,0],
 		[1,'pantheon','pantheon',0,0],
+		[1,'penrose','penrose',0,0],# unknown, just guessing 
 		[1,'lumina','lumina-desktop',0,1],
 		[0,'manokwari','manokwari',1,0],
 		[1,'ukui','ukui-session',0,1],
 		);
 		foreach my $item (@desktops){
 			# Check if in xdg_desktop OR desktop_session OR if in $item->[6] and in ps_gui
-			if ( (($item->[0] && ($xdg_desktop eq $item->[1] || $desktop_session eq $item->[1] )) ||
-			   (!$item->[0] && ($xdg_desktop =~ /$item->[1]/ || $desktop_session  =~ /$item->[1]/ )) ) ||
-			   ($item->[5] && @ps_gui && (grep {/$item->[5]/} @ps_gui) ) ){
+			if ((($item->[0] && ($xdg_desktop eq $item->[1] || $desktop_session eq $item->[1])) ||
+			   (!$item->[0] && ($xdg_desktop =~ /$item->[1]/ || $desktop_session  =~ /$item->[1]/))) ||
+			   ($item->[5] && @ps_gui && (grep {/$item->[5]/} @ps_gui))){
 				($desktop[0],$desktop[1]) = main::program_data($item->[2]);
 				$b_gtk = $item->[3];
 				$b_qt = $item->[4];
@@ -19589,20 +21695,20 @@ sub get_env_xprop_gnome_based_data {
 	# before gnome test eventually this needs to be better organized so all the 
 	# xprop tests are in the same section, but this is good enough for now.
 	# NOTE: was checking for 'muffin' but that's not part of cinnamon
-	if ( $xdg_desktop eq 'cinnamon' || $gdmsession eq 'cinnamon' || 
-	 (main::check_program('muffin') || main::check_program('cinnamon-session') ) && 
-	     ($b_xprop && main::awk(\@xprop,'_muffin') )){
+	if ($xdg_desktop eq 'cinnamon' || $gdmsession eq 'cinnamon' || 
+	 (main::check_program('muffin') || main::check_program('cinnamon-session')) && 
+	 ($b_xprop && main::awk(\@xprop,'_muffin'))){
 		($desktop[0],$desktop[1]) = main::program_data('cinnamon','cinnamon',0);
 		$b_gtk = 1;
 		$desktop[0] ||= 'Cinnamon';
 	}
 	elsif ($xdg_desktop eq 'mate' || $gdmsession eq 'mate' || 
-	 ( $b_xprop && main::awk(\@xprop,'_marco') )){
+	 ($b_xprop && main::awk(\@xprop,'_marco'))){
 		# NOTE: mate-about and mate-sesssion vary which has the higher number, neither 
 		# consistently corresponds to the actual MATE version, so check both.
 		my %versions = ('mate-about' => '','mate-session' => '');
 		foreach my $key (keys %versions){
-			if ($program = main::check_program($key) ) {
+			if ($program = main::check_program($key)){
 				@data = main::program_data($key,$program,0);
 				$desktop[0] = $data[0];
 				$versions{$key} = $data[1];
@@ -19614,11 +21720,11 @@ sub get_env_xprop_gnome_based_data {
 		$desktop[0] ||= 'MATE';
 	}
 	# See sub for logic and comments
-	elsif (check_gnome() ){
-		if (main::check_program('gnome-about') ) {
+	elsif (check_gnome()){
+		if (main::check_program('gnome-about')){
 			($desktop[0],$desktop[1]) = main::program_data('gnome-about');
 		}
-		elsif (main::check_program('gnome-shell') ) {
+		elsif (main::check_program('gnome-shell')){
 			($desktop[0],$desktop[1]) = main::program_data('gnome','gnome-shell');
 		}
 		$b_gtk = 1;
@@ -19666,7 +21772,6 @@ sub check_gnome {
 		$detection = 'xprop-root';
 		$b_gnome = 1;
 	}
-	
 	main::log_data('data','$detection:$b_gnome>>' . $detection . ":$b_gnome") if $b_log;
 	eval $end if $b_log;
 	return $b_gnome;
@@ -19674,13 +21779,13 @@ sub check_gnome {
 sub get_env_xprop_non_gnome_based_data {
 	eval $start if $b_log;
 	my ($program,@version_data,$version);
-	#print join("\n", @xprop), "\n";
+	# print join("\n", @xprop), "\n";
 	# String: "This is xfdesktop version 4.2.12"
 	# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
 	# note: some distros/wm (e.g. bunsen) set xdg to xfce to solve some other 
 	# issues so don't test for that. $xdg_desktop eq 'xfce'
 	if ($xdg_desktop eq 'xfce' || $gdmsession eq 'xfce' || 
-	 (main::check_program('xfdesktop')) && main::awk(\@xprop,'^(xfdesktop|xfce)' )){
+	 (main::check_program('xfdesktop')) && main::awk(\@xprop,'^(xfdesktop|xfce)')){
 		# this is a very expensive test that doesn't usually result in a find
 		# talk to xfce to see what id they will be using for xfce 5
 # 		if (main::awk(\@xprop, 'xfce4')){
@@ -19699,7 +21804,7 @@ sub get_env_xprop_non_gnome_based_data {
 		# out of x, this error goes to stderr, so it's an empty result
 		$desktop[1] = main::awk(\@version_data,$data[0],$data[1],'\s+');
 		#$desktop[1] = main::program_version('xfdesktop',$data[0],$data[1],$data[2],$data[5],$data[6]);
-		if ( !$desktop[1] ){
+		if (!$desktop[1]){
 			@data = main::program_values("xfce${version}-panel");
 			# print Data::Dumper::Dumper \@data;
 			# this returns an error message to stdout in x, which breaks the version
@@ -19717,20 +21822,20 @@ sub get_env_xprop_non_gnome_based_data {
 			$desktop[2] = $data[3];
 		}
 	}
-	elsif ( $xdg_desktop eq 'moksha' || $gdmsession eq 'moksha' || 
-	 (main::check_program('enlightenment') || main::check_program('moksha') ) && main::awk(\@xprop,'moksha') ){
+	elsif ($xdg_desktop eq 'moksha' || $gdmsession eq 'moksha' || 
+	 (main::check_program('enlightenment') || main::check_program('moksha')) && main::awk(\@xprop,'moksha')){
 		# no -v or --version but version is in xprop -root
 		# ENLIGHTENMENT_VERSION(STRING) = "Moksha 0.2.0.15989"
 		$desktop[0] = 'Moksha';
-		$desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+' );
+		$desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+');
 		$desktop[1] =~ s/"?(Moksha|Enlightenment)\s([^"]+)"?/$2/i if $desktop[1];
 	}
-	elsif ( $xdg_desktop eq 'enlightenment' || $gdmsession eq 'enlightenment' || 
-	 (main::check_program('enlightenment') && main::awk(\@xprop,'enlightenment' ) ) ){
+	elsif ($xdg_desktop eq 'enlightenment' || $gdmsession eq 'enlightenment' || 
+	 (main::check_program('enlightenment') && main::awk(\@xprop,'enlightenment'))){
 		# no -v or --version but version is in xprop -root
 		# ENLIGHTENMENT_VERSION(STRING) = "Enlightenment 0.16.999.49898"
 		$desktop[0] = 'Enlightenment';
-		$desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+' );
+		$desktop[1] = main::awk(\@xprop,'(enlightenment|moksha)_version',2,'\s+=\s+');
 		$desktop[1] =~ s/"?(Moksha|Enlightenment)\s([^"]+)"?/$2/i if $desktop[1];
 	}
 	# the sequence here matters, some desktops like icewm, razor, let you set different 
@@ -19754,7 +21859,7 @@ sub get_env_xprop_non_gnome_based_data {
 		);
 		foreach my $item (@desktops){
 			if (main::check_program($item->[0]) && main::awk(\@xprop,$item->[1]) && 
-			    (!$item->[4] || (@ps_gui && (grep {/$item->[4]/} @ps_gui ))) ){
+			 (!$item->[4] || (@ps_gui && (grep {/$item->[4]/} @ps_gui)))){
 				($desktop[0],$desktop[1]) =  main::program_data($item->[2]);
 				last;
 			}
@@ -19766,10 +21871,15 @@ sub get_env_xprop_non_gnome_based_data {
 sub get_ps_de_data {
 	eval $start if $b_log;
 	my ($program,@version_data);
-	main::set_ps_gui() if !$b_ps_gui;
+	main::set_ps_gui() if !$loaded{'ps-gui'};
 	if (@ps_gui){
+		# the sequence here matters, some desktops like icewm, razor, let you set different
+		# wm, so we want to get the main controlling desktop first
 		# 1 check program; 2 ps_gui search; 3 data; 4: trigger alternate values/version
 		my @desktops =(
+		['icewm','icewm','icewm'],
+		['WindowMaker','WindowMaker','wmaker',''],
+		['2bwm','2bwm','2bwm',''],# unverified
 		['9wm','9wm','9wm',''],
 		['afterstep','afterstep','afterstep',''],
 		['aewm++','aewm\+\+','aewm++',''],
@@ -19781,7 +21891,9 @@ sub get_ps_de_data {
 		['bspwm','bspwm','bspwm',''],
 		['cagebreak','cagebreak','cagebreak',''],
 		['calmwm','calmwm','calmwm',''],
+		['catwm','catwm','catwm',''],# unverified
 		['clfswm','.*(sh|c?lisp)?.*clfswm','clfswm',''],
+		['ctwm','ctwm','ctwm',''],
 		['cwm','(openbsd-)?cwm','cwm',''],
 		['dwm','dwm','dwm',''],
 		['echinus','echinus','echinus',''],
@@ -19798,12 +21910,16 @@ sub get_ps_de_data {
 		['fvwm','fvwm','fvwm',''],
 		['glass','glass','glass',''],
 		['hackedbox','hackedbox','hackedbox',''],
+		['herbstluftwm','herbstluftwm','herbstluftwm'],
 		['instantwm','instantwm','instantwm',''],
+		['i3','i3','i3',''],
 		['ion3','ion3','ion3',''],
 		['jbwm','jbwm','jbwm',''],
 		['jwm','jwm','jwm',''],
 		['larswm','larswm','larswm',''],
+		['leftwm','leftwm','leftwm',''],
 		['lwm','lwm','lwm',''],
+		['mcwm','mcwm','mcwm',''],# unverified
 		['mini','mini','mini',''],
 		['musca','musca','musca',''],
 		['mvwm','mvwm','mvwm',''],
@@ -19814,11 +21930,13 @@ sub get_ps_de_data {
 		['orbital','orbital','orbital',''],
 		['pekwm','pekwm','pekwm',''],
 		['perceptia','perceptia','perceptia',''],
+		['penrose','penrose','penrose',''],# unverified
 		['qtile','.*(python.*)?qtile','qtile',''],
 		['qvwm','qvwm','qvwm',''],
 		['ratpoison','ratpoison','ratpoison',''],
 		['sawfish','sawfish','sawfish',''],
 		['scrotwm','scrotwm','scrotwm',''],
+		['snapwm','snapwm','snapwm',''],# unverified
 		['spectrwm','spectrwm','spectrwm',''],
 		['stumpwm','(sh|c?lisp)?.*stumpwm','stumpwm',''],
 		['sway','sway','sway',''],
@@ -19826,10 +21944,13 @@ sub get_ps_de_data {
 		['tinywm','tinywm','tinywm',''],
 		['tvtwm','tvtwm','tvtwm',''],
 		['twm','twm','twm',''],
+		['uwm','uwm','uwm',''],# unverified
 		['waycooler','waycooler','way-cooler',''],
 		['way-cooler','way-cooler','way-cooler',''],
-		['WindowMaker','WindowMaker','wmaker',''],
 		['windowlab','windowlab','windowlab',''],
+		['wmfs','wmfs','wmfs',''],# unverified
+		['wmfs2','wmfs2','wmfs2',''],# unverified
+		['wingo','wingo','wingo',''],# unverified
 		# not in debian apt, current is wmii, version 3
 		['wmii2','wmii2','wmii2',''],
 		['wmii','wmii','wmii',''],
@@ -19867,10 +21988,10 @@ sub set_qt_data {
 	my $kde_version = $kde_session_version;
 	$program = '';
 	if (!$kde_version){
-		if ($program = main::check_program("kded6") ){$kde_version = 6;}
-		elsif ($program = main::check_program("kded5") ){$kde_version = 5;}
-		elsif ($program = main::check_program("kded4") ){$kde_version = 4;}
-		elsif ($program = main::check_program("kded") ){$kde_version = '';}
+		if ($program = main::check_program("kded6")){$kde_version = 6;}
+		elsif ($program = main::check_program("kded5")){$kde_version = 5;}
+		elsif ($program = main::check_program("kded4")){$kde_version = 4;}
+		elsif ($program = main::check_program("kded")){$kde_version = '';}
 	}
 	# alternate: qt4-default, qt4-qmake or qt5-default, qt5-qmake
 	# often this exists, is executable, but actually is nothing, shows error
@@ -19880,7 +22001,7 @@ sub set_qt_data {
 	if (!$desktop[3] && main::check_program('qtdiag')){
 		($desktop[2],$desktop[3]) = main::program_data('qtdiag');
 	}
-	if (!$desktop[3] && ($program = main::check_program("kf$kde_version-config") )){
+	if (!$desktop[3] && ($program = main::check_program("kf$kde_version-config"))){
 		@version_data = main::grabber("$program --version 2>/dev/null");
 		$desktop[2] = 'Qt';
 		$desktop[3] = main::awk(\@version_data,'^Qt:',2) if @version_data;
@@ -19896,11 +22017,11 @@ sub set_qt_data {
 
 sub get_wm {
 	eval $start if $b_log;
-	if (!$b_wmctrl) {
+	if (!$force{'wmctrl'}){
 		get_wm_main();
 	}
 	# note, some wm, like cinnamon muffin, do not appear in ps aux, but do in wmctrl
-	if ( (!$desktop[5] || $b_wmctrl) && (my $program = main::check_program('wmctrl'))){
+	if ((!$desktop[5] || $force{'wmctrl'}) && (my $program = main::check_program('wmctrl'))){
 		get_wm_wmctrl($program);
 	}
 	eval $end if $b_log;
@@ -19922,22 +22043,22 @@ sub get_wm_main {
 		}
 	}
 	if (!$desktop[5]){
-		main::set_ps_gui() if ! $b_ps_gui;
+		main::set_ps_gui() if !$loaded{'ps-gui'};
 		# order matters, see above logic
 		# due to lisp/python starters, clfswm/stumpwm/qtile will not detect here
-		$wms = '9wm|aewm\+\+|aewm|afterstep|amiwm|antiwm|awesome|blackbox|bspwm|budgie-wm|';
-		$wms .= 'cagebreak|calmwm|clfswm|compiz|(openbsd-)?cwm|fluxbox|';
-		$wms .= 'deepin-wm|dwm|echinus|evilwm|';
+		$wms = '2bwm|9wm|aewm\+\+|aewm|afterstep|amiwm|antiwm|awesome|blackbox|';
+		$wms .= 'cagebreak|calmwm|catwm|clfswm|compiz|ctwm|(openbsd-)?cwm|fluxbox';
+		$wms .= '|bspwm|budgie-wm|deepin-wm|dwm|echinus|evilwm|';
 		$wms .= 'fireplace|flwm|fvwm-crystal|fvwm1|fvwm2|fvwm3|fvwm95|fvwm|';
 		$wms .= 'gala|glass|gnome-shell|hackedbox|i3|instantwm|ion3|jbwm|jwm|';
-		$wms .= 'twin|kwin_wayland|kwin_x11|kwin|larswm|lwm|';
-		$wms .= 'matchbox-window-manager|marco|mini|muffin|';
+		$wms .= 'twin|kwin_wayland|kwin_x11|kwin|larswm|leftwm|lwm|';
+		$wms .= 'matchbox-window-manager|marco|mcwm|mini|muffin|';
 		$wms .= 'musca|deepin-mutter|mutter|deepin-metacity|metacity|mvwm|mwm|';
 		$wms .= 'nawm|notion|openbox|orbital|perceptia|qtile|qvwm|';
-		$wms .= 'ratpoison|sawfish|scrotwm|spectrwm|';
+		$wms .= 'penrose|ratpoison|sawfish|scrotwm|snapwm|spectrwm|';
 		$wms .= 'stumpwm|sway|tinywm|tvtwm|twm|ukwm|';
-		$wms .= 'way-?cooler|windowlab|WindowMaker|wm2|wmii2|wmii|wmx|';
-		$wms .= 'xfwm4|xfwm5|xmonad|yeahwm';
+		$wms .= 'way-?cooler|windowlab|WindowMaker|wingo|wm2|wmfs2?|wmii2?|wmx|';
+		$wms .= 'xfwm[45]?|xmonad|yeahwm';
 		foreach (@ps_gui){
 			if (/^($wms)$/){
 				$working = $1;
@@ -19963,10 +22084,10 @@ sub get_wm_wmctrl {
 		$desktop[5] =~ s/\d+\.\d\S+|[\[\(].*\d+\.\d.*[\)\]]//g;
 		$desktop[5] = main::trimmer($desktop[5]);
 		# change Metacity (Marco) to marco
-		if ($desktop[5] =~ /marco/i) {$desktop[5] = 'marco'}
-		elsif ($desktop[5] =~ /muffin/i) {$desktop[5] = 'muffin'}
-		elsif (lc($desktop[5]) eq 'gnome shell') {$desktop[5] = 'gnome-shell'}
-		elsif ($desktop_session eq 'trinity' && lc($desktop[5]) eq 'kwin') {$desktop[5] = 'Twin'}
+		if ($desktop[5] =~ /marco/i){$desktop[5] = 'marco'}
+		elsif ($desktop[5] =~ /muffin/i){$desktop[5] = 'muffin'}
+		elsif (lc($desktop[5]) eq 'gnome shell'){$desktop[5] = 'gnome-shell'}
+		elsif ($desktop_session eq 'trinity' && lc($desktop[5]) eq 'kwin'){$desktop[5] = 'Twin'}
 		get_wm_version('wmctrl',$desktop[5]);
 	}
 	eval $end if $b_log;
@@ -19976,7 +22097,7 @@ sub get_wm_version {
 	my ($type,$wm) = @_;
 	# we don't want the gnome-shell version, and the others have no --version
 	# we also don't want to run --version again on stuff we already have tested
-	return if ! $wm || $wm =~ /^(budgie-wm|gnome-shell)$/ || ($desktop[0] && lc($desktop[0]) eq lc($wm) );
+	return if !$wm || $wm =~ /^(budgie-wm|gnome-shell)$/ || ($desktop[0] && lc($desktop[0]) eq lc($wm));
 	my $temp = (split(/\s+/, $wm))[0];
 	if ($temp){
 		$temp = (split(/\s+/, $temp))[0];
@@ -19993,7 +22114,7 @@ sub get_wm_version {
 
 sub set_info_data {
 	eval $start if $b_log;
-	main::set_ps_gui() if ! $b_ps_gui;
+	main::set_ps_gui() if !$loaded{'ps-gui'};
 	my (@data,@info,$item);
 	my $pattern = 'alltray|awn|bar|bmpanel|bmpanel2|budgie-panel|cairo-dock|';
 	$pattern .= 'dde-dock|dmenu|dockbarx|docker|docky|dzen|dzen2|';
@@ -20005,7 +22126,7 @@ sub set_info_data {
 	$pattern .= 'razor-panel|razorqt-panel|stalonetray|swaybar|taskbar|tint2|trayer|';
 	$pattern .= 'ukui-panel|vala-panel|wbar|wharf|wingpanel|witray|';
 	$pattern .= 'xfce4-panel|xfce5-panel|xmobar|yabar';
-	if (@data = grep {/^($pattern)$/} @ps_gui ) {
+	if (@data = grep {/^($pattern)$/} @ps_gui){
 		# only one entry per type, can be multiple
 		foreach $item (@data){
 			if (! grep {$item =~ /$_/} @info){
@@ -20044,20 +22165,1007 @@ sub set_xprop {
 
 }
 
+## DeviceData / PCI / SOC
+# creates arrays: $devices{'audio'}; $devices{'graphics'}; $devices{'hwraid'}; 
+# $devices{'network'}; $devices{'timer'} and local @devices for logging/debugging
+# 0 type
+# 1 type_id
+# 2 bus_id
+# 3 sub_id
+# 4 device
+# 5 vendor_id
+# 6 chip_id
+# 7 rev
+# 8 port
+# 9 driver
+# 10 modules
+# 11 driver_nu [bsd, like: em0 - driver em; nu 0. Used to match IF in -n
+# 12 subsystem/vendor
+# 13 subsystem vendor_id:chip id
+# 14 soc handle
+# 15 serial number
+{
+package DeviceData;
+my (@bluetooth,@devices,@files,@full_names,@pcis,@temp,@temp2,@temp3);
+my ($b_bt_check);
+my ($busid,$busid_nu,$chip_id,$content,$device,$driver,$driver_nu,$file,
+$handle,$modules,$port,$rev,$serial,$temp,$type,$type_id,$vendor,$vendor_id);
+
+sub set {
+	eval $start if $b_log;
+	${$_[0]} = 1; # set check by reference
+	if ($use{'pci'}){
+		if (!$bsd_type){
+			if ($alerts{'lspci'}->{'action'} eq 'use'){
+				lspci_data();
+			}
+			# ! -d '/proc/bus/pci'
+			# this is sketchy, a sbc won't have pci, but a non sbc arm may have it, so 
+			# build up both and see what happens
+			if ($b_arm || $b_mips || $b_ppc || $b_sparc){
+				soc_data();
+			}
+		}
+		else {
+			# if (1 == 1){
+			if ($alerts{'pciconf'}->{'action'} eq 'use'){
+				pciconf_data();
+			}
+			elsif ($alerts{'pcidump'}->{'action'} eq 'use'){
+				pcidump_data();
+			}
+			elsif ($alerts{'pcictl'}->{'action'} eq 'use'){
+				pcictl_data();
+			}
+		}
+		if ($dbg[9]){
+			print Data::Dumper::Dumper $devices{'audio'};
+			print Data::Dumper::Dumper $devices{'bluetooth'};
+			print Data::Dumper::Dumper $devices{'graphics'};
+			print Data::Dumper::Dumper $devices{'network'};
+			print Data::Dumper::Dumper $devices{'hwraid'};
+			print Data::Dumper::Dumper $devices{'timer'};
+			print "vm: $device_vm\n";
+		}
+		if ($b_log){
+			main::log_data('dump','$devices{audio}',$devices{'audio'});
+			main::log_data('dump','$devices{bluetooth}',$devices{'bluetooth'});
+			main::log_data('dump','$devices{graphics}',$devices{'graphics'});
+			main::log_data('dump','$devices{hwraid}',$devices{'hwraid'});
+			main::log_data('dump','$devices{network}',$devices{'network'});
+			main::log_data('dump','$devices{timer}',$devices{'timer'});
+		}
+	}
+	@devices = undef;
+	eval $end if $b_log;
+}
+
+sub lspci_data {
+	eval $start if $b_log;
+	my ($subsystem,$subsystem_id);
+	my @data = pci_grabber('lspci');
+	# print Data::Dumper::Dumper \@data;
+	foreach (@data){
+		# print "$_\n";
+		if ($device){
+			if ($_ =~ /^~$/){
+				@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+				$rev,$port,$driver,$modules,$driver_nu,$subsystem,$subsystem_id);
+				assign_data('pci',\@temp);
+				$device = '';
+				# print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
+			}
+			elsif ($_ =~ /^Subsystem.*\[([a-f0-9]{4}:[a-f0-9]{4})\]/){
+				$subsystem_id = $1;
+				$subsystem = (split(/^Subsystem:\s*/, $_))[1];
+				$subsystem =~ s/(\s?\[[^\]]+\])+$//g;
+				$subsystem = main::cleaner($subsystem);
+				$subsystem = main::pci_cleaner($subsystem,'pci');
+				$subsystem = main::pci_cleaner_subsystem($subsystem);
+				# print "ss:$subsystem\n";
+			}
+			elsif ($_ =~ /^I\/O\sports/){
+				$port = (split(/\s+/, $_))[3];
+				# print "p:$port\n";
+			}
+			elsif ($_ =~ /^Kernel\sdriver\sin\suse/){
+				$driver = (split(/:\s*/, $_))[1];
+			}
+			elsif ($_ =~ /^Kernel\smodules/i){
+				$modules = (split(/:\s*/, $_))[1];
+			}
+		}
+		# note: arm servers can have more complicated patterns
+		# 0002:01:02.0 Ethernet controller [0200]: Cavium, Inc. THUNDERX Network Interface Controller virtual function [177d:a034] (rev 08)
+		elsif ($_ =~ /^(([0-9a-f]{2,4}:)?[0-9a-f]{2}:[0-9a-f]{2})[.:]([0-9a-f]+)\s(.*)\s\[([0-9a-f]{4}):([0-9a-f]{4})\](\s\(rev\s([^\)]+)\))?/){
+			$busid = $1;
+			$busid_nu = hex($3);
+			@temp = split(/:\s+/, $4);
+			$device = $temp[1];
+			$type = $temp[0];
+			$vendor_id = $5;
+			$chip_id = $6;
+			$rev = ($8)? $8 : '';
+			$device = main::cleaner($device);
+			$temp[0] =~ /\[([^\]]+)\]$/;
+			$type_id = $1;
+			$use{'hardware-raid'} = 1 if $type_id eq '0104';
+			$type = lc($type);
+			$type = main::pci_cleaner($type,'pci');
+			$type =~ s/\s+$//;
+			# print "$type\n";
+			($driver,$driver_nu,$modules,$subsystem,$subsystem_id) = ('','','','','');
+		}
+	}
+	print Data::Dumper::Dumper \@devices if $dbg[4];
+	main::log_data('dump','lspci @devices',\@devices) if $b_log;
+	eval $end if $b_log;
+}
+
+# em0@pci0:6:0:0:	class=0x020000 card=0x10d315d9 chip=0x10d38086 rev=0x00 hdr=0x00
+#     vendor     = 'Intel Corporation'
+#     device     = 'Intel 82574L Gigabit Ethernet Controller (82574L)'
+#     class      = network
+#     subclass   = ethernet
+sub pciconf_data {
+	eval $start if $b_log;
+	my @data = pci_grabber('pciconf');
+	foreach (@data){
+		if ($driver){
+			if ($_ =~ /^~$/){
+				$vendor = main::cleaner($vendor);
+				$device = main::cleaner($device);
+				# handle possible regex in device name, like [ConnectX-3] 
+				# and which could make matches fail
+				my $device_temp = main::regex_cleaner($device);
+				if ($vendor && $device){
+					if (main::regex_cleaner($vendor) !~ /\Q$device_temp\E/i){
+						$device = "$vendor $device";
+					}
+				}
+				elsif (!$device){
+					$device = $vendor;
+				}
+				@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+				$rev,$port,$driver,$modules,$driver_nu);
+				assign_data('pci',\@temp);
+				$driver = '';
+				# print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
+			}
+			elsif ($_ =~ /^vendor/){
+				$vendor = (split(/\s+=\s+/, $_))[1];
+				# print "p:$port\n";
+			}
+			elsif ($_ =~ /^device/){
+				$device = (split(/\s+=\s+/, $_))[1];
+			}
+			elsif ($_ =~ /^class/i){
+				$type = (split(/\s+=\s+/, $_))[1];
+			}
+		}
+		# pre freebsd 13, note chip is product+vendor
+		# atapci0@pci0:0:1:1:	class=0x01018a card=0x00000000 chip=0x71118086 rev=0x01 hdr=0x00
+		# freebsd 13
+		# isab0@pci0:0:1:0:	class=0x060100 rev=0x00 hdr=0x00 vendor=0x8086 device=0x7000 subvendor=0x0000 subdevice=0x0000
+		if (/^([^@]+)\@pci([0-9]{1,3}:[0-9]{1,3}:[0-9]{1,3}):([0-9]{1,3}):/){
+			$driver = $1;
+			$busid = $2;
+			$busid_nu = $3;
+			$driver = $1;
+			$driver =~ s/([0-9]+)$//;
+			$driver_nu = $1;
+			# we don't use the sub sub class part of the class id, just first 4
+			if (/\bclass=0x([\S]{4})\S*\b/){
+				$type_id = $1; 
+			}
+			if (/\brev=0x([\S]+)\b/){
+				$rev = $1;
+			}
+			if (/\bvendor=0x([\S]+)\b/){
+				$vendor_id = $1;
+			}
+			if (/\bdevice=0x([\S]+)\b/){
+				$chip_id = $1;
+			}
+			# yes, they did it backwards, product+vendor id
+			if (/\bchip=0x([a-f0-9]{4})([a-f0-9]{4})\b/){
+				$chip_id = $1;
+				$vendor_id = $2;
+			}
+			($device,$type,$vendor) = ('','','');
+		}
+	}
+	print Data::Dumper::Dumper \@devices if $dbg[4];
+	main::log_data('dump','pciconf @devices',\@devices) if $b_log;
+	eval $end if $b_log;
+}
+
+sub pcidump_data {
+	eval $start if $b_log;
+	my @data = pci_grabber('pcidump');
+	main::set_dboot_data() if !$loaded{'dboot'};
+	foreach (@data){
+		if ($_ =~ /^~$/ && $busid && $device){
+			@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+			$rev,$port,$driver,$modules,$driver_nu,'','','',$serial);
+			assign_data('pci',\@temp);
+			($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+			$rev,$port,$driver,$modules,$driver_nu,$serial) = undef;
+			next;
+		}
+		if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s([^:]+)$/i){
+			$busid = $1;
+			$busid_nu = $2;
+			($driver,$driver_nu) = pcidump_driver("$busid:$busid_nu") if $dboot{'pci'};
+			$device = main::cleaner($3);
+		}
+		elsif ($_ =~ /^0x[\S]{4}:\s+Vendor ID:\s+([0-9a-f]{4}),?\s+Product ID:\s+([0-9a-f]{4})/){
+			$vendor_id = $1;
+			$chip_id = $2;
+		}
+		elsif ($_ =~ /^0x[\S]{4}:\s+Class:\s+([0-9a-f]{2})(\s[^,]+)?,?\s+Subclass:\s+([0-9a-f]{2})(\s+[^,]+)?,?(\s+Interface: ([0-9a-f]+),?\s+Revision: ([0-9a-f]+))?/){
+			$type = pci_class($1);
+			$type_id = "$1$3";
+		}
+		elsif (/^Serial Number:\s*(\S+)/){
+			$serial = $1;
+		}
+	}
+	print Data::Dumper::Dumper \@devices if $dbg[4];
+	main::log_data('dump','pcidump @devices',\@devices) if $b_log;
+	eval $end if $b_log;
+}
+sub pcidump_driver {
+	eval $start if $b_log;
+	my $bus_id = $_[0];
+	my ($driver,$nu);
+	for (@{$dboot{'pci'}}){
+		if (/^$bus_id:([^0-9]+)([0-9]+):/){
+			$driver = $1;
+			$nu = $2;
+			last;
+		}
+	}
+	eval $end if $b_log;
+	return ($driver,$nu);
+}
+sub pcictl_data {
+	eval $start if $b_log;
+	my @data = pci_grabber('pcictl');
+	my @data2 = pci_grabber('pcictl-n');
+	foreach (@data){
+		if ($_ =~ /^~$/ && $busid && $device){
+			@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+			$rev,$port,$driver,$modules,$driver_nu);
+			assign_data('pci',\@temp);
+			($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
+			$rev,$port,$driver,$modules,$driver_nu) = undef;
+			next;
+		}
+		# it's too fragile to get these in one matching so match, trim, next match
+		if (/\s+\[([^\]0-9]+)([0-9]+)\]$/){
+			$driver = $1;
+			$driver_nu = $2;
+			$_ =~ s/\s+\[[^\]]+\]$//;
+		}
+		if (/\s+\(.*?(revision 0x([^\)]+))?\)/){
+			$rev = $2 if $2;
+			$_ =~ s/\s+\([^\)]+?\)$//;
+		}
+		if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s+([^.]+?)$/i){
+			$busid = $1;
+			$busid_nu = $2;
+			$device = main::cleaner($3);
+			my $working = (grep {/^${busid}:${busid_nu}:\s/} @data2)[0];
+			if ($working && 
+			 $working =~ /^${busid}:${busid_nu}:\s+0x([0-9a-f]{4})([0-9a-f]{4})\s+\(0x([0-9a-f]{2})([0-9a-f]{2})[0-9a-f]+\)/){
+				$vendor_id = $1;
+				$chip_id = $2;
+				$type = pci_class($3);
+				$type_id = "$3$4";
+			}
+		}
+	}
+	print Data::Dumper::Dumper \@devices if $dbg[4];
+	main::log_data('dump','pcidump @devices',\@devices) if $b_log;
+	eval $end if $b_log;
+}
+
+sub pci_grabber {
+	eval $start if $b_log;
+	my ($program) = @_;
+	my ($args,$path,$pattern,@data,@working);
+	if ($program eq 'lspci'){
+		# 2.2.8 lspci did not support -k, added in 2.2.9, but -v turned on -k 
+		$args = ' -nnv';
+		$path = $alerts{'lspci'}->{'path'};
+		$pattern = '^[0-9a-f]+:';
+	}
+	elsif ($program eq 'pciconf'){
+		$args = ' -lv';
+		$path = $alerts{'pciconf'}->{'path'};
+		$pattern = '^([^@]+)\@pci';
+	}
+	elsif ($program eq 'pcidump'){
+		$args = ' -v';
+		$path = $alerts{'pcidump'}->{'path'};
+		$pattern = '^[0-9a-f]+:';
+	}
+	elsif ($program eq 'pcictl'){
+		$args = ' pci0 list -N';
+		$path = $alerts{'pcictl'}->{'path'};
+		$pattern = '^[0-9a-f:]+:';
+	}
+	elsif ($program eq 'pcictl-n'){
+		$args = ' pci0 list -n';
+		$path = $alerts{'pcictl'}->{'path'};
+		$pattern = '^[0-9a-f:]+:';
+	}
+	if ($fake{'pciconf'} || $fake{'pcictl'} || $fake{'pcidump'}){
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pciconf/pci-freebsd-8.2-2";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pcidump/pci-openbsd-6.1-vm.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pcictl/pci-netbsd-9.1-vm.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lspci/racermach-1-knnv.txt";
+		# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/lspci/rk016013-knnv.txt";
+		# @data = main::reader($file,'strip');
+	}
+	else {
+		@data = main::grabber("$path $args 2>/dev/null",'','strip');
+	}
+	if (@data){
+		$use{'pci-tool'} = 1 if scalar @data > 10;
+		foreach (@data){
+			# this is the group separator and assign trigger
+			if ($_ =~ /$pattern/i){
+				push(@working, '~');
+			}
+			push(@working, $_);
+		}
+		push(@working, '~');
+	}
+	print Data::Dumper::Dumper \@working if $dbg[30];
+	eval $end if $b_log;
+	return @working;
+}
+
+sub soc_data {
+	eval $start if $b_log;
+	soc_devices_files();
+	soc_devices();
+	soc_devicetree();
+	print Data::Dumper::Dumper \@devices if $dbg[4];
+	main::log_data('dump','soc @devices',\@devices) if $b_log;
+	eval $end if $b_log;
+}
+# 1: /sys/devices/platform/soc/1c30000.ethernet/uevent:["DRIVER=dwmac-sun8i", "OF_NAME=ethernet", 
+# "OF_FULLNAME=/soc/ethernet@1c30000", "OF_COMPATIBLE_0=allwinner,sun8i-h3-emac", 
+# "OF_COMPATIBLE_N=1", "OF_ALIAS_0=ethernet0", # "MODALIAS=of:NethernetT<NULL>Callwinner,sun8i-h3-emac"]
+# 2: /sys/devices/platform/soc:audio/uevent:["DRIVER=bcm2835_audio", "OF_NAME=audio", "OF_FULLNAME=/soc/audio", 
+# "OF_COMPATIBLE_0=brcm,bcm2835-audio", "OF_COMPATIBLE_N=1", "MODALIAS=of:NaudioT<NULL>Cbrcm,bcm2835-audio"]
+# 3: /sys/devices/platform/soc:fb/uevent:["DRIVER=bcm2708_fb", "OF_NAME=fb", "OF_FULLNAME=/soc/fb", 
+# "OF_COMPATIBLE_0=brcm,bcm2708-fb", "OF_COMPATIBLE_N=1", "MODALIAS=of:NfbT<NULL>Cbrcm,bcm2708-fb"]
+# 4: /sys/devices/platform/soc/1c40000.gpu/uevent:["OF_NAME=gpu", "OF_FULLNAME=/soc/gpu@1c40000", 
+# "OF_COMPATIBLE_0=allwinner,sun8i-h3-mali", "OF_COMPATIBLE_1=allwinner,sun7i-a20-mali", 
+# "OF_COMPATIBLE_2=arm,mali-400", "OF_COMPATIBLE_N=3", 
+# "MODALIAS=of:NgpuT<NULL>Callwinner,sun8i-h3-maliCallwinner,sun7i-a20-maliCarm,mali-400"]
+# 5: /sys/devices/platform/soc/soc:internal-regs/d0018180.gpio/uevent
+# 6: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:05/uevent
+#  ["DRIVER=AR8035", "OF_NAME=ethernet-phy"
+# 7: /sys/devices/soc.0/1c30000.eth/uevent
+# 8: /sys/devices/wlan.26/uevent [from pine64]
+# 9: /sys/devices/platform/audio/uevent:["DRIVER=bcm2835_AUD0", "OF_NAME=audio"
+# 10: /sys/devices/vio/71000002/uevent:["DRIVER=ibmveth", "OF_NAME=l-lan"
+# 11: /sys/devices/platform/soc:/soc:i2c-hdmi:/i2c-2/2-0050/uevent:['OF_NAME=hdmiddc'
+# 12: /sys/devices/platform/soc:/soc:i2c-hdmi:/uevent:['DRIVER=i2c-gpio', 'OF_NAME=i2c-hdmi'
+# 13: /sys/devices/platform/scb/fd580000.ethernet/uevent
+# 14: /sys/devices/platform/soc/fe300000.mmcnr/mmc_host/mmc1/mmc1:0001/mmc1:0001:1/uevent (wifi, pi 3,4)
+# 15: Pi BT: /sys/devices/platform/soc/fe201000.serial/uevent
+# 16: Pi BT: /sys/devices/platform/soc/fe201000.serial/tty/ttyAMA0/hci0
+sub soc_devices_files {
+	eval $start if $b_log;
+	if (-d '/sys/devices/platform/'){
+		@files = main::globber('/sys/devices/platform/soc*/*/uevent');
+		@temp2 = main::globber('/sys/devices/platform/soc*/*/*/uevent');
+		push(@files,@temp2) if @temp2;
+		if (-e '/sys/devices/platform/scb'){
+			@temp2 = main::globber('/sys/devices/platform/scb/*/uevent');
+			push(@files,@temp2) if @temp2;
+			@temp2 = main::globber('/sys/devices/platform/scb/*/*/uevent');
+			push(@files,@temp2) if @temp2;
+		}
+		@temp2 = main::globber('/sys/devices/platform/*/uevent');
+		push(@files,@temp2) if @temp2;
+	}
+	if (main::globber('/sys/devices/soc*')){
+		@temp2 = main::globber('/sys/devices/soc*/*/uevent');
+		push(@files,@temp2) if @temp2;
+		@temp2 = main::globber('/sys/devices/soc*/*/*/uevent');
+		push(@files,@temp2) if @temp2;
+	}
+	@temp2 = main::globber('/sys/devices/*/uevent'); # see case 8
+	push(@files,@temp2) if @temp2;
+	@temp2 = main::globber('/sys/devices/*/*/uevent'); # see case 10
+	push(@files,@temp2) if @temp2;
+	@temp2 = undef;
+	# not sure why, but even as root/sudo, /subsystem|driver/uevent are unreadable with -r test true
+	@files = grep {!/\/(subsystem|driver)\//} @files if @files;
+	main::uniq(\@files);
+	eval $end if $b_log;
+}
+
+sub soc_devices {
+	eval $start if $b_log;
+	my (@working);
+	set_bluetooth() if !$b_bt_check;
+	foreach $file (@files){
+		next if -z $file;
+		$chip_id = $file;
+		# variants: /soc/20100000.ethernet/ /soc/soc:audio/ /soc:/ /soc@0/ /soc:/12cb0000.i2c:/
+		# mips: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:07/
+		# ppc: /sys/devices/vio/71000002/
+		$chip_id =~ /\/sys\/devices\/(platform\/)?(soc[^\/]*\/)?([^\/]+\/)?([^\/]+\/)?([^\/\.:]+)([\.:])?([^\/:]+)?:?\/uevent$/;
+		$chip_id = $5;
+		$temp = $7;
+		@working = main::reader($file, 'strip') if -r $file;
+		($device,$driver,$handle,$type,$vendor_id) = (undef,undef,undef,undef,undef);
+		foreach my $data (@working){
+			@temp2 = split('=', $data);
+			if ($temp2[0] eq 'DRIVER'){
+				$driver = $temp2[1];
+				$driver =~ s/-/_/g if $driver; # kernel uses _, not - in module names
+			}
+			elsif ($temp2[0] eq 'OF_NAME'){
+				$type = $temp2[1];
+			}
+			# we'll use these paths to test in device tree pci completer
+			elsif ($temp2[0] eq 'OF_FULLNAME' && $temp2[1]){
+				# we don't want the short names like /soc, /led and so on
+				push(@full_names, $temp2[1]) if (() = $temp2[1] =~ /\//g) > 1;
+				$handle = (split('@', $temp2[1]))[-1] if $temp2[1] =~ /@/;
+			}
+			elsif ($temp2[0] eq 'OF_COMPATIBLE_0'){
+				@temp3 = split(',', $temp2[1]);
+				$device = $temp3[-1];
+				$vendor_id = $temp3[0];
+			}
+		}
+		# it's worthless, we can't use it
+		next if ! defined $type;
+		$type_id = $type;
+		if (@bluetooth && $type eq 'serial'){
+			my $file_temp = $file;
+			$file_temp =~ s/uevent$//;
+			$type = 'bluetooth' if grep {/$file_temp/} @bluetooth;
+		}
+		$chip_id = '' if ! defined $chip_id;
+		$vendor_id = '' if ! defined $vendor_id;
+		$driver = '' if ! defined $driver;
+		$handle = '' if ! defined $handle;
+		$busid = (defined $temp && main::is_int($temp)) ? $temp: 0;
+		$type = soc_type($type,$vendor_id,$driver);
+		($busid_nu,$modules,$port,$rev) = (0,'','','');
+		@temp3 = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,$rev,
+		$port,$driver,$modules,'','','',$handle);
+		assign_data('soc',\@temp3);
+		main::log_data('dump','soc devices: @devices @temp3',\@temp3) if $b_log;
+	}
+	eval $end if $b_log;
+}
+sub soc_devicetree {
+	eval $start if $b_log;
+	# now we want to fill in stuff that was not in /sys/devices/ 
+	if (-d '/sys/firmware/devicetree/base/soc'){
+		@files = main::globber('/sys/firmware/devicetree/base/soc/*/compatible');
+		my $test = (@full_names) ? join('|', sort @full_names) : 'xxxxxx';
+		set_bluetooth() if !$b_bt_check;
+		foreach $file (@files){
+			if ($file !~ m%$test%){
+				($handle,$content,$device,$type,$type_id,$vendor_id) = ('','','','','','');
+				$content = main::reader($file, 'strip',0) if -r $file;
+				$file =~ m%soc/([^@]+)@([^/]+)/compatible$%;
+				$type = $1;
+				next if !$type || !$content;
+				$handle = $2 if $2;
+				$type_id = $type;
+				if (@bluetooth && $type eq 'serial'){
+					my $file_temp = $file;
+					$file_temp =~ s/uevent$//;
+					$type = 'bluetooth' if grep {/$file_temp/} @bluetooth;
+				}
+				if ($content){
+					@temp3 = split(',', $content);
+					$vendor_id = $temp3[0];
+					$device = $temp3[-1];
+					# strip off those weird device tree special characters
+					$device =~ s/\x01|\x02|\x03|\x00//g;
+				}
+				$type = soc_type($type,$vendor_id,'');
+				@temp3 = ($type,$type_id,0,0,$device,$vendor_id,'soc','','','','','','','',$handle);
+				assign_data('soc',\@temp3);
+				main::log_data('dump','devicetree: @devices @temp3',\@temp3) if $b_log;
+			}
+		}
+	}
+	eval $end if $b_log;
+}
+sub set_bluetooth {
+	# special case of pi bt on ttyAMA0
+	$b_bt_check = 1;
+	@bluetooth = main::globber('/sys/class/bluetooth/*') if -e '/sys/class/bluetooth';
+	@bluetooth = map {$_ = Cwd::abs_path($_);$_} @bluetooth if @bluetooth;
+	@bluetooth = grep {!/usb/} @bluetooth if @bluetooth; # we only want non usb bt
+	main::log_data('dump','soc bt: @bluetooth', \@bluetooth) if $b_log;
+}
+sub assign_data {
+	my ($tool,$data) = @_;
+	if (check_graphics($data->[0],$data->[1])){
+		push(@{$devices{'graphics'}},[@$data]);
+		$use{'soc-gfx'} = 1 if $tool eq 'soc';
+	}
+	# for hdmi, we need gfx/audio both
+	if (check_audio($data->[0],$data->[1])){
+		push(@{$devices{'audio'}},[@$data]);
+		$use{'soc-audio'} = 1 if $tool eq 'soc';
+	}
+	if (check_bluetooth($data->[0],$data->[1])){
+		push(@{$devices{'bluetooth'}},[@$data]);
+		$use{'soc-bluetooth'} = 1 if $tool eq 'soc';
+	}
+	elsif (check_hwraid($data->[0],$data->[1])){
+		push(@{$devices{'hwraid'}},[@$data]);
+		$use{'soc-hwraid'} = 1 if $tool eq 'soc';
+	}
+	elsif (check_network($data->[0],$data->[1])){
+		push(@{$devices{'network'}},[@$data]);
+		$use{'soc-network'} = 1 if $tool eq 'soc';
+	}
+	elsif (check_timer($data->[0],$data->[1])){
+		push(@{$devices{'timer'}},[@$data]);
+		$use{'soc-timer'} = 1 if $tool eq 'soc';
+	}
+	# not used at this point, -M comes before ANG
+	# $device_vm = check_vm($data[4]) if ((!$b_ppc && !$b_mips) && !$device_vm);
+	push(@devices,[@$data]);
+}
+# note: for soc, these have been converted in soc_type()
+sub check_audio {
+	if (($_[1] && length($_[1]) == 4 && $_[1] =~ /^04/) ||
+	 ($_[0] && $_[0] =~ /^(audio|hdmi|multimedia|sound)$/i)){
+		return 1;
+	}
+	else {return 0}
+}
+sub check_bluetooth {
+	if (($_[1] && length($_[1]) == 4 && $_[1] eq '0d11') ||
+	 ($_[0] && $_[0] =~ /^(bluetooth)$/i)){
+		return 1;
+	}
+	else {return 0}
+}
+sub check_graphics {
+	# note: multimedia class 04 is viddeo if 0400. 'tv' is risky I think
+	if (($_[1] && length($_[1]) == 4 &&  ($_[1] =~ /^03/ || $_[1] eq '0400' || 
+	 $_[1] eq '0d80')) || 
+	 ($_[0] && $_[0] =~ /^(vga|display|hdmi|3d|video|tv|television)$/i)){
+		return 1;
+	}
+	else {return 0}
+}
+sub check_hwraid {
+	return 1 if ($_[1] && $_[1] eq '0104');
+}
+# NOTE: class 06 subclass 80 
+# https://www-s.acm.illinois.edu/sigops/2007/roll_your_own/7.c.1.html
+# 0d20: 802.11a 0d21: 802.11b 0d80: other wireless
+sub check_network {
+	if (($_[1] && length($_[1]) == 4 && ($_[1] =~/^02/ || $_[1] =~ /^0d2/ || $_[1] eq '0680')) ||
+	 ($_[0] && $_[0] =~  /^(ethernet|network|wifi|wlan)$/i)){
+		return 1;
+	}
+	else {return 0}
+}
+sub check_timer {
+	return 1 if ($_[0] && $_[0] eq 'timer');
+}
+sub check_vm {
+	if ($_[0] && $_[0] =~ /(innotek|vbox|virtualbox|vmware|qemu)/i){
+		return $1
+	}
+	else {return ''}
+}
+
+sub soc_type {
+	my ($type,$info,$driver) = @_;
+	# I2S or i2s. I2C is i2 controller |[iI]2[Ss]. note: odroid hdmi item is sound only
+	# snd_soc_dummy. simple-audio-amplifier driver: speaker_amp
+	if (($driver && $driver =~ /codec/) || ($info && $info =~ /codec/) ||
+	 ($type && $type =~ /codec/)){
+		$type = 'codec';
+	}
+	elsif (($driver && $driver =~ /dummy/i) || ($info && $info =~ /dummy/i)){
+		$type = 'dummy';
+	}
+	elsif ($type =~ /^(daudio|.*hifi.*|.*sound[_-]card|.*dac[0-9]?)$/i ||
+	 ($info && $info !~ /amp/i && $info =~ /(sound|audio)/i) || 
+	 ($driver && $driver =~ /(audio|snd|sound)/i)){
+		$type = 'audio';
+	}
+	# no need for bluetooth since that's only found in pi, handled above
+	elsif ($type =~ /^((meson-?)?fb|disp|display(-[^\s]+)?|gpu|.*mali|vpu)$/i){
+		$type = 'display';
+	}
+	# includes ethernet-phy, meson-eth
+	elsif ($type =~ /^(([^\s]+-)?eth|ethernet(-[^\s]+)?|lan|l-lan)$/i){
+		$type = 'ethernet';
+	}
+	elsif ($type =~ /^(.*wlan.*|.*wifi.*|.*mmcnr.*)$/i){
+		$type = 'wifi';
+	}
+	# needs to catch variants like hdmi-tx but not hdmi-connector
+	elsif ($type =~ /^(.*hdmi(-?tx)?)$/i){
+		$type = 'hdmi';
+	}
+	elsif ($type =~ /^timer$/i){
+		$type = 'timer';
+	}
+	return $type;
+}
+sub pci_class {
+	eval $start if $b_log;
+	my ($id) = @_;
+	$id = lc($id);
+	my %classes = (
+	'00' => 'unclassified',
+	'01' => 'mass-storage',
+	'02' => 'network',
+	'03' => 'display',
+	'04' => 'audio',
+	'05' => 'memory',
+	'06' => 'bridge',
+	'07' => 'communication',
+	'08' => 'peripheral',
+	'09' => 'input',
+	'0a' => 'docking',
+	'0b' => 'processor',
+	'0c' => 'serialbus',
+	'0d' => 'wireless',
+	'0e' => 'intelligent',
+	'0f' => 'satellite',
+	'10' => 'encryption',
+	'11' => 'signal-processing',
+	'12' => 'processing-accelerators',
+	'13' => 'non-essential-instrumentation',
+	'40' => 'coprocessor',
+	'ff' => 'unassigned',
+	);
+	my $type = (defined $classes{$id}) ? $classes{$id}: 'unhandled';
+	eval $end if $b_log;
+	return $type;
+}
+}
+
+## DiskDataBSD
+# handles disks and partition extra data for disks bsd, raid-zfs, 
+# partitions, swap, unmounted
+# glabel: partID, logical/physical-block-size, uuid, label, size
+# disklabel: partID, block-size, fs, size
+{
+package DiskDataBSD;
+# sets initial pure dboot data, and fills it in with 
+# disklabel/gpart partition and advanced data
+sub set {
+	eval $start if $b_log;
+	$loaded{'disk-data-bsd'} = 1;
+	set_dboot_disks();
+	if ($use{'bsd-partition'}){
+		if ($alerts{'gpart'}->{'action'} eq 'use'){
+			set_gpart_data();
+		}
+		elsif ($alerts{'disklabel'}->{'action'} eq 'use'){
+			set_disklabel_data();
+		}
+	}
+	eval $end if $b_log;
+}
+sub get {
+	eval $start if $b_log;
+	my $id = $_[0];
+	return if !$id || !%disks_bsd;
+	$id =~ s|^/dev/||;
+	my (%data);
+	# this handles mainly zfs, which can be either disk or part
+	if ($disks_bsd{$id}){
+		%data = %{$disks_bsd{$id}};
+		delete $data{'partitions'} if $data{'partitions'};
+	}
+	else {
+		OUTER: foreach my $key (keys %disks_bsd){
+			if ($disks_bsd{$key}->{'partitions'}){
+				foreach my $part (keys %{$disks_bsd{$key}->{'partitions'}}){
+					if ($part eq $id){
+						%data = %{$disks_bsd{$key}->{'partitions'}{$part}};
+						last OUTER;
+					}
+				}
+			}
+		}
+	}
+	eval $end if $b_log;
+	return %data;
+}
+sub set_dboot_disks {
+	eval $start if $b_log;
+	my ($working,@temp);
+	foreach my $id (sort keys %{$dboot{'disk'}}){
+		next if !@{$dboot{'disk'}->{$id}};
+		foreach (@{$dboot{'disk'}->{$id}}){
+			my @row = split(/:\s*/, $_);
+			next if !$row[0];
+			# no dots, note: ada2: 2861588MB BUT: ada2: 600.000MB/s 
+			# print "$_ i: $i\n";
+			# openbsd/netbsd matches will often work
+			if ($row[0] =~ /(^|,\s*)([0-9\.]+\s*[MGTPE])i?B?[,.\s]+([0-9]+)\ssectors$|^</){
+				$working = main::translate_size($2);
+				# seen:  for some reason, size/sectors did not result in clean integer value
+				$disks_bsd{$id}->{'block-physical'} = POSIX::ceil(($working/$3)*1024) if $3;
+				$disks_bsd{$id}->{'size'} = $working;
+			}
+			# don't set both, if smartctl installed, we want to use its data so having
+			# only one of logical/physical will trip use of smartctl values
+			if ($row[0] =~ /[\s,]+([0-9]+)\sbytes?[\s\/]sect/){
+				#$disks_bsd{$id}->{'block-logical'} = $1;
+				$disks_bsd{$id}->{'block-physical'} = $1;
+			}
+			if ($row[1]){
+				if ($row[1] =~ /<([^>]+)>/){
+					$disks_bsd{$id}->{'model'} = $1 if $1;
+					$disks_bsd{$id}->{'type'} = 'removable' if $_ =~ /removable/;
+					# <Generic-, Compact Flash, 1.00>
+					my $count = ($disks_bsd{$id}->{'model'} =~ tr/,//);
+					if ($count && $count > 1){
+						@temp = split(/,\s*/, $disks_bsd{$id}->{'model'});
+						$disks_bsd{$id}->{'model'} = $temp[1];
+					}
+				}
+				if ($row[1] =~ /\bserial\.(\S*)/){
+					$disks_bsd{$id}->{'serial'} = $1;
+				}
+			}
+			if (!$disks_bsd{$id}->{'serial'} && $row[0] =~ /^Serial\sNumber\s(.*)/){
+				$disks_bsd{$id}->{'serial'} = $1;
+			}
+			# mmcsd0:32GB <SDHC SL32G 8.0 SN 27414E9E MFG 07/2014 by 3 SD> at mmc0 50.0MHz/4bit/65535-block
+			if (!$disks_bsd{$id}->{'serial'} && $row[0] =~ /(\s(SN|s\/n)\s(\S+))[>\s]/){
+				$disks_bsd{$id}->{'serial'} = $3;
+				# strip out the SN/MFG so it won't show in model
+				$row[0] =~ s/$1//;
+				$row[0] =~ s/\sMFG\s[^>]+//;
+			}
+			# these were mainly FreeBSD/Dragonfly matches
+			if (!$disks_bsd{$id}->{'size'} && $row[0] =~ /^([0-9]+\s*[KMGTPE])i?B?[\s,]/){
+				$working = main::translate_size($1);
+				$disks_bsd{$id}->{'size'} = $working;
+			}
+			if ($row[0] =~ /(device$|^([0-9\.]+\s*[KMGT]B\s+)?<)/){
+				$row[0] =~ s/\bdevice$//g;
+				$row[0] =~ /<([^>]*)>(\s(.*))?/;
+				$disks_bsd{$id}->{'model'} = $1 if $1;
+				$disks_bsd{$id}->{'spec'} = $3 if $3;
+			}
+			if ($row[0] =~ /^([0-9\.]+[MG][B]?\/s)/){
+				$disks_bsd{$id}->{'speed'} = $1;
+				$disks_bsd{$id}->{'speed'} =~ s/\.[0-9]+// if $disks_bsd{$id}->{'speed'};
+			}
+			$disks_bsd{$id}->{'model'} = main::disk_cleaner($disks_bsd{$id}->{'model'});
+			if (!$disks_bsd{$id}->{'serial'} && $show{'disk'} && $extra > 1 && 
+			 $alerts{'bioctl'}->{'action'} eq 'use'){
+				$disks_bsd{$id}->{'serial'} = bioctl_data($id);
+			}
+		}
+	}
+	print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+	main::log_data('dump','%disks_bsd',\%disks_bsd) if $b_log;
+	eval $end if $b_log;
+}
+sub bioctl_data {
+	eval $start if $b_log;
+	my $id = $_[0];
+	my $serial;
+	my $working = (main::grabber($alerts{'bioctl'}->{'path'} . " $id  2>&1",'','strip'))[0];
+	if ($working){
+		if ($working =~ /permission/i){
+			$alerts{'bioctl'}->{'action'} = 'permissions';
+		}
+		elsif ($working =~ /serial[\s-]?(number|n[ou]\.?)?\s+(\S+)$/i){
+			$serial = $2;
+		}
+	}
+	eval $end if $b_log;
+	return $serial;
+}
+sub set_disklabel_data {
+	eval $start if $b_log;
+	my ($cmd,@data,@working);
+	# see docs/inxi-data.txt for fs info
+	my %fs = (
+	'4.2bsd' => 'ffs',
+	'4.4lfs' => 'lfs',
+	);
+	foreach my $id (keys %disks_bsd){
+		$cmd = "$alerts{'disklabel'}->{'path'} $id 2>&1";
+		@data = main::grabber($cmd,'','strip');
+		main::log_data('dump','disklabel @data', \@data) if $b_log;
+		if (scalar @data < 4 && (grep {/permission/i} @data)){
+			$alerts{'disklabel'}->{'action'} = 'permissions';
+			$alerts{'disklabel'}->{'message'} = main::row_defaults('root-feature');
+			last;
+		}
+		else {
+			my ($b_part,$duid,$part_id,$bytes_sector) = undef;
+			if ($extra > 2 && $show{'disk'} && $alerts{'fdisk'}->{'action'} eq 'use'){
+				$disks_bsd{$id}->{'partition-table'} = fdisk_data($id);
+			}
+			foreach my $row (@data){
+				if ($row =~ /^\d+\spartitions:/){
+					$b_part = 1;
+					next;
+				}
+				if (!$b_part){
+					@working = split(/:\s*/, $row);
+					if ($working[0] eq 'bytes/sector'){
+						$disks_bsd{$id}->{'block-physical'} = $working[1];
+						$bytes_sector = $working[1];
+					}
+					elsif ($working[0] eq 'duid'){
+						$working[1] =~ s/^0+$//; # dump duid if all 0s
+						$disks_bsd{$id}->{'duid'} = $working[1];
+					}
+					elsif ($working[0] eq 'label'){
+						$disks_bsd{$id}->{'dlabel'} = $working[1];
+					}
+				}
+				# part:        size [bytes*sector]      offset    fstype [fsize bsize cpg]# mount
+				# d:          8388608         18838976  4.2BSD   2048 16384 12960 # /tmp
+				else {
+					@working = split(/:?\s+#?\s*/, $row);
+					# netbsd: disklabel: super block size 0 AFTER partitions started!
+					# note: 'unused' fs type is NOT unused space, it's often the entire disk!!
+					if (($working[0] && $working[0] eq 'disklabel') ||
+					 ($working[3] && $working[3] =~ /ISO9660|unused/i) || 
+					 (!$working[1] || !main::is_numeric($working[1]))){
+						next;
+					}
+					$part_id = $id . $working[0];
+					$working[1] = $working[1]*$bytes_sector/1024 if $working[1];
+					$disks_bsd{$id}->{'partitions'}{$part_id}{'size'} = $working[1];
+					if ($working[3]){ # fs
+						$working[3] = lc($working[3]);
+						$working[3] = $fs{$working[3]} if $fs{$working[3]}; #translate
+					}
+					$disks_bsd{$id}->{'partitions'}{$part_id}{'fs'} = $working[3];
+					# OpenBSD: mount point; NetBSD: (Cyl. 0 - 45852*)
+					if ($working[7] && $working[7] =~ m|^/|){ 
+						$disks_bsd{$id}->{'partitions'}{$part_id}{'mount'} = $working[7];
+					}
+					$disks_bsd{$id}->{'partitions'}{$part_id}{'uuid'} = '';
+					$disks_bsd{$id}->{'partitions'}{$part_id}{'label'} = '';
+				}
+			}
+		}
+	}
+	print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+	main::log_data('dump', '%disks_bsd', \%disks_bsd) if $b_log;
+	eval $end if $b_log;
+}
+sub fdisk_data {
+	eval $start if $b_log;
+	my $id = $_[0];
+	my ($scheme);
+	my @data = main::grabber($alerts{'fdisk'}->{'path'} . " -v $id  2>&1",'','strip');
+	foreach (@data){
+		if (/permission/i){
+			$alerts{'fdisk'}->{'action'} = 'permissions';
+			last;
+		}
+		elsif (/^(GUID|MBR):/){
+			$scheme = ($1 eq 'GUID') ? 'GPT' : $1;
+			last;
+		}
+	}
+	eval $start if $b_log;
+	return $scheme;
+}
+# 2021-03: openbsd: n/a; dragonfly: no 'list'; freebsd: yes
+sub set_gpart_data {
+	eval $start if $b_log;
+	my @data = main::grabber($alerts{'gpart'}->{'path'} . " list 2>/dev/null",'','strip');
+	main::log_data('dump', 'gpart: @data', \@data) if $b_log;
+	my ($b_cd,$id,$part_id,$type);
+	for (@data){
+		my @working = split(/\s*:\s*/, $_);
+		if ($working[0] eq 'Geom name'){
+			$id = $working[1];
+			# [1. Name|Geom name]: iso9660/FVBE
+			$b_cd = ($id =~ /iso9660/i) ? 1: 0;
+			next;
+		}
+		elsif ($working[0] eq 'scheme'){
+			$disks_bsd{$id}->{'scheme'} = $working[1];
+			next;
+		}
+		elsif ($working[0] eq 'Consumers'){
+			$type = 'disk';
+			next;
+		}
+		elsif ($working[0] eq 'Providers'){
+			$type = 'part';
+			next;
+		}
+		if (!$b_cd && $type && $type eq 'part'){
+			if ($working[0] =~ /^[0-9]+\.\s*Name/){
+				$part_id = $working[1];
+			}
+			# eg: label:(null) - we want to show null
+			elsif ($working[0] eq 'label'){
+				$working[1] =~ s/\(|\)//g; 
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'label'} = $working[1];
+			}
+			elsif ($working[0] eq 'Mediasize'){
+				$working[1] =~ s/\s+\(.*$//; # trim off the (2.4G)
+				# gpart shows in bytes, not KiB. For the time being...
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'size'} = $working[1]/1024 if $working[1];
+			}
+			elsif ($working[0] eq 'rawuuid'){
+				$working[1] =~ s/\(|\)//g; 
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'uuid'} = $working[1];
+			}
+			elsif ($working[0] eq 'Sectorsize'){
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'physical-block-size'} = $working[1];
+			}
+			elsif ($working[0] eq 'Stripesize'){
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'logical-block-size'} = $working[1];
+			}
+			elsif ($working[0] eq 'type'){
+				$working[1] =~ s/\(|\)//g; 
+				$disks_bsd{$id}->{'partitions'}{$part_id}{'fs'} = $working[1];
+			}
+		}
+		# really strange results happen if no dboot disks were found and it's zfs!
+		elsif (!$b_cd && $type && $type eq 'disk' && $disks_bsd{$id}->{'size'}){
+			# need to see raid, may be > 1 Consumers
+			if ($working[0] =~ /^[0-9]+\.\s*Name/){
+				$id = $working[1];
+			}
+			elsif ($working[0] eq 'Mediasize'){
+				$working[1] =~ s/\s+\(.*$//; # trim off the (2.4G)
+				# gpart shows in bytes, not KiB. For the time being...
+				$disks_bsd{$id}->{'size'} = $working[1]/1024 if $working[1];
+			}
+			elsif ($working[0] eq 'Sectorsize'){
+				$disks_bsd{$id}->{'block-physical'} = $working[1];
+			}
+		}
+	}
+	print Data::Dumper::Dumper \%disks_bsd if $dbg[34];
+	main::log_data('dump', '%disks_bsd', \%disks_bsd) if $b_log;
+	eval $end if $b_log;
+}
+}
+
 sub get_display_manager {
 	eval $start if $b_log;
 	my (@data,@found,$path,$working,$b_run,$b_vrun,$b_vrunrc);
 	# ldm - LTSP display manager. Note that sddm does not appear to have a .pid 
 	# extension in Arch note: to avoid positives with directories, test for -f 
-	# explicitly, not -e. Guessing on cdm.pid
-	my @dms = qw(cdm.pid entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid 
+	# explicitly, not -e. Guessing on cdm.pid. pcdm uses vt, PCDM-vt9.pid
+	my @dms = qw(cdm.pid entranced.pid gdm.pid gdm3.pid kdm.pid kdm3.pid ldm.pid 
 	lightdm.pid lxdm.pid mdm.pid nodm.pid pcdm.pid sddm.pid slim.lock 
-	tdm.pid udm.pid wdm.pid xdm.pid xenodm.pid);
+	slim.pid tdm.pid udm.pid wdm.pid xdm.pid xenodm.pid);
 	# these are the only one I know of so far that have version info
 	my @dms_version = qw(gdm gdm3 lightdm slim);
 	$b_run = 1 if -d "/run";
 	# in most linux, /var/run is a sym link to /run, so no need to check it twice
-	if ( -d "/var/run" ){
+	if (-d "/var/run"){
 		my $rdlink = readlink('/var/run');
 		$b_vrun = 1 if !$rdlink || ($rdlink && $rdlink ne '/run');
 		$b_vrunrc = 1 if -d "/var/run/rc.d";
@@ -20071,11 +23179,11 @@ sub get_display_manager {
 		$working = $id;
 		$working =~ s/\.\S+$//;
 		# note: there were issues with duplicated dm's in inxi, checking @found corrects it
-		if ( ( ( $b_run && ( -f "/run/$id" || -d "/run/$working" ) ) || 
-		   ( $b_vrun && ( -f "/var/run/$id" || -d "/var/run/$working" ) ) || 
-		   ( $b_vrunrc && ( -f "/var/run/rc.d/$working" || -d "/var/run/rc.d/$id" ) ) ) && 
-		   ! grep {/$working/} @found ){
-			if ($extra > 2 && awk( \@dms_version, $working) && ($path = check_program($working)) ){}
+		if ((($b_run && (-f "/run/$id" || -d "/run/$working")) || 
+		 ($b_vrun && (-f "/var/run/$id" || -d "/var/run/$working")) || 
+		 ($b_vrunrc && (-f "/var/run/rc.d/$working" || -d "/var/run/rc.d/$id"))) && 
+		 !grep {/$working/} @found){
+			if ($extra > 2 && awk(\@dms_version, $working) && ($path = check_program($working))){}
 			else {$path = $working;}
 			# print "$path $extra\n";
 			@data = program_data($working,$path,3);
@@ -20086,15 +23194,15 @@ sub get_display_manager {
 	}
 	if (!@found){
 		# ly does not have a run/pid file
-		if (grep {$_ eq 'ly'} @ps_gui) {
+		if (grep {$_ eq 'ly'} @ps_gui){
 			@data = program_data('ly','ly',3);
 			$found[0] = $data[0];
 			$found[0] .= ' ' . $data[1] if $data[1];
 		}
-		elsif (grep {/startx$/} @ps_gui) {
+		elsif (grep {/startx$/} @ps_gui){
 			$found[0] = 'startx';
 		}
-		elsif (grep {$_ eq 'xinit'} @ps_gui) {
+		elsif (grep {$_ eq 'xinit'} @ps_gui){
 			$found[0] = 'xinit';
 		}
 	}
@@ -20105,10 +23213,12 @@ sub get_display_manager {
 	return join(', ', @found) if @found;
 }
 
-## Get DistroData
+## DistroData
 {
 package DistroData;
-my (@distro_data,@osr);
+my (@distro_files,@osr,@working);
+my ($distro,$distro_file,$distro_id,$system_base) = ('','','','');
+my ($etc_issue,$lc_issue,$os_release) = ('','','/etc/os-release');
 sub get {
 	eval $start if $b_log;
 	if ($bsd_type){
@@ -20118,33 +23228,59 @@ sub get {
 		get_linux_distro();
 	}
 	eval $end if $b_log;
-	return @distro_data;
+	return ($distro,$system_base);
 }
 
 sub get_bsd_os {
 	eval $start if $b_log;
-	my ($distro) = ('');
 	if ($bsd_type eq 'darwin'){
-		my $file = '/System/Library/CoreServices/SystemVersion.plist';
-		if (-f $file){
-			my @data = main::reader($file);
-			@data = grep {/(ProductName|ProductVersion)/} @data if @data;
-			@data = grep {/<string>/} @data if @data;
-			@data = map {s/<[\/]?string>//g; } @data if @data;
-			$distro = join(' ', @data);
+		$distro_file = '/System/Library/CoreServices/SystemVersion.plist';
+		if (-f $distro_file){
+			@working = main::reader($distro_file);
+			@working = grep {/(ProductName|ProductVersion)/} @working if @working;
+			@working = grep {/<string>/} @working if @working;
+			@working = map {s/<[\/]?string>//g; } @working if @working;
+			$distro = join(' ', @working);
+		}
+	}
+	if (!$distro){
+		my $bsd_type_osr = 'dragonfly';
+		@osr = main::reader($os_release) if -r $os_release;
+		if (@osr && $bsd_type =~ /($bsd_type_osr)/ && (grep {/($bsd_type_osr)/i} @osr)){
+			$distro = get_os_release();
+			$distro_id = lc($1);
+		}
+	}
+	if (!$distro){
+		my $bsd_type_version = 'truenas';
+		my ($version_file,$version_info) = ('/etc/version','');
+		$version_info = main::reader($version_file,'strip') if -r $version_file;
+		if ($version_info && $version_info =~ /($bsd_type_version)/i){
+			$distro = $version_info;
+			$distro_id = lc($1);
+		}
+	}	
+	if (!$distro){
+		# seen a case without osx file, or was it permissions?
+		# this covers all the other bsds anyway, no problem.
+		$distro = "$uname[0] $uname[2]";
+		$distro_id = lc($uname[0]);
+	}
+	if ($distro &&
+	 (-e '/etc/pkg/GhostBSD.conf' || -e '/usr/local/etc/pkg/repos/GhostBSD.conf') && 
+	  $distro =~ /freebsd/i){
+		my $version = (main::grabber("pkg query '%v' os-generic-userland-base 2>/dev/null"))[0];
+		# only swap if we get result from the query
+		if ($version){
+			$system_base = $distro;
+			$distro = "GhostBSD $version";
 		}
 	}
-	# seen a case without osx file, or was it permissions?
-	# this covers all the other bsds anyway, no problem.
-	$distro = "$uname[0] $uname[2]" if !$distro;
-	@distro_data = ($distro,'');
+	system_base_bsd() if $extra > 0;
 	eval $end if $b_log;
 }
 
 sub get_linux_distro {
-	eval $start if $b_log;
-	my ($distro,$distro_id,$distro_file,$system_base) = ('','','','');
-	my ($b_issue,$b_osr,$b_use_issue,@working);
 	# order matters!
 	my @derived = qw(antix-version aptosid-version bodhibuilder.conf kanotix-version 
 	knoppix-version pclinuxos-release mandrake-release manjaro-release mx-version 
@@ -20158,60 +23294,67 @@ sub get_linux_distro {
 	# note, pclinuxos has all these mandrake/mandriva files, careful!
 	my $lsb_good_s = 'mandrake-release|mandriva-release|mandrakelinux-release|manjaro-release';
 	my $os_release_good_s = 'altlinux-release|arch-release|pclinuxos-release|rpi-issue|SuSE-release';
+ 	my ($b_issue,$b_lsb,$b_skip_issue,$b_skip_osr);
+	my ($issue,$lsb_release) = ('/etc/issue','/etc/lsb-release');
+	$b_issue = 1 if -f $issue;
+	$b_lsb = 1 if -f $lsb_release;
+	# note: OpenSuse Tumbleweed 2018-05 has made /etc/issue created by sym link to /run/issue
+	# and then made that resulting file 700 permissions, which is obviously a mistake
+	$etc_issue = main::reader($issue,'strip',0) if -r $issue;
+	# debian issue can end with weird escapes like \n \l 
+	# antergos: Antergos Linux \r (\l)
+	$etc_issue = main::clean_characters($etc_issue) if $etc_issue;
 	# note: always exceptions, so wild card after release/version: 
 	# /etc/lsb-release-crunchbang
 	# wait to handle since crunchbang file is one of the few in the world that 
 	# uses this method
-	my @distro_files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
+	@distro_files = main::globber('/etc/*[-_]{[rR]elease,[vV]ersion,issue}*');
 	push(@distro_files, '/etc/bodhibuilder.conf') if -r '/etc/bodhibuilder.conf';
-	my $lsb_release = '/etc/lsb-release';
-	my $b_lsb = 1 if -f $lsb_release;
-	my ($etc_issue,$issue,$lc_issue) = ('','/etc/issue','');
-	$b_issue = 1 if -f $issue;
-	# note: OpenSuse Tumbleweed 2018-05 has made /etc/issue created by sym link to /run/issue
-	# and then made that resulting file 700 permissions, which is obviously a mistake
-	$etc_issue = main::reader($issue,'',0) if -r $issue;
-	$etc_issue = main::clean_characters($etc_issue);
-	my $os_release = '/etc/os-release';
 	@osr = main::reader($os_release) if -r $os_release;
-	# debian issue can end with weird escapes like \n \l 
-	# antergos: Antergos Linux \r (\l)
 	if ($etc_issue){
-		$lc_issue = lc($etc_issue) if $etc_issue;
-		if ($lc_issue =~ /(antergos|grml|linux lite)/){
+		$lc_issue = lc($etc_issue);
+		if ($lc_issue =~ /(antergos|grml|linux lite|openmediavault)/){
 			$distro_id = $1;
-			$b_use_issue = 1;
+			$b_skip_issue = 1;
 		}
+		# this raspbian detection fails for rasberry pi os
 		elsif ($lc_issue =~ /(raspbian|peppermint)/){
 			$distro_id = $1;
 			$distro_file = $os_release if @osr;
 		}
+		# note: wrong fix, applies to both raspbian and raspberry pi os
+		# assumption here is that r pi os fixes this before stable release
+		elsif ($lc_issue =~ /^debian/ && -e '/etc/apt/sources.list.d/raspi.list' && 
+		(grep {/[^#]+raspberrypi\.org/} main::reader('/etc/apt/sources.list.d/raspi.list'))){
+			$distro_id = 'raspios' ;
+		}
 	}
 	# Note that antergos changed this around 	# 2018-05, and now lists 
 	# antergos in os-release, sigh... We want these distros to use os-release 
 	# if it contains their names. Last check below
-	if ( @osr && ( grep {/(manjaro|antergos|chakra|pclinuxos|zorin)/i} @osr ) ){
+	if (@osr && (grep {/(manjaro|antergos|chakra|guix|pclinuxos|raspberry pi os|zorin)/i} @osr)){
 		$distro_file = $os_release;
 	}
-	$distro_id = 'armbian' if grep {/armbian/} @distro_files;
+	if (grep {/armbian/} @distro_files){
+		$distro_id = 'armbian' ;
+	}
 	main::log_data('dump','@distro_files',\@distro_files) if $b_log;
 	main::log_data('data',"distro_file-1: $distro_file") if $b_log;
 	if (!$distro_file){
 		if (scalar @distro_files == 1){
 			$distro_file = $distro_files[0];
 		}
-		elsif (scalar @distro_files > 1) {
+		elsif (scalar @distro_files > 1){
 			# special case, to force manjaro/antergos which also have arch-release
 			# manjaro should use lsb, which has the full info, arch uses os release
 			# antergos should use /etc/issue. We've already checked os-release above
-			if ($distro_id eq 'antergos' || (grep {/antergos|chakra|manjaro/} @distro_files )){
+			if ($distro_id eq 'antergos' || (grep {/antergos|chakra|manjaro/} @distro_files)){
 				@distro_files = grep {!/arch-release/} @distro_files;
-				#$system_base = 'Arch Linux';
 			}
 			my $distro_files_s = join('|', @distro_files);
 			@working = (@derived,@primary);
 			foreach my $file (@working){
-				if ( "/etc/$file" =~ /($distro_files_s)$/){
+				if ("/etc/$file" =~ /($distro_files_s)$/){
 					# Now lets see if the distro file is in the known-good working-lsb-list
 					# if so, use lsb-release, if not, then just use the found file
 					# this is for only those distro's with self named release/version files
@@ -20232,7 +23375,7 @@ sub get_linux_distro {
 	}
 	main::log_data('data',"distro_file-2: $distro_file") if $b_log;
 	# first test for the legacy antiX distro id file
-	if ( -r '/etc/antiX'){
+	if (-r '/etc/antiX'){
 		@working = main::reader('/etc/antiX');
 		$distro = main::awk(\@working,'antix.*\.iso') if @working;
 		$distro = main::clean_characters($distro) if $distro;
@@ -20241,15 +23384,15 @@ sub get_linux_distro {
 	# This would never apply for ubuntu or debian, which will filter down to the following 
 	# conditions. In general if there's a specific distro release file available, that's to 
 	# be preferred, but this is a good backup.
-	elsif ($distro_file && $b_lsb && ($distro_file =~ /\/etc\/($lsb_good_s)$/ || $distro_file eq $lsb_release) ){
+	elsif ($distro_file && $b_lsb && ($distro_file =~ /\/etc\/($lsb_good_s)$/ || $distro_file eq $lsb_release)){
 		$distro = get_lsb_release();
 	}
 	elsif ($distro_file && $distro_file eq $os_release){
 		$distro = get_os_release();
-		$b_osr = 1;
+		$b_skip_osr = 1;
 	}
 	# if distro id file was found and it's not in the exluded primary distro file list, read it
-	elsif ( $distro_file && -s $distro_file && $distro_file !~ /\/etc\/($exclude_s)$/){
+	elsif ($distro_file && -s $distro_file && $distro_file !~ /\/etc\/($exclude_s)$/){
 		# new opensuse uses os-release, but older ones may have a similar syntax, so just use 
 		# the first line
 		if ($distro_file eq '/etc/SuSE-release'){
@@ -20275,54 +23418,63 @@ sub get_linux_distro {
 		}
 		$distro = main::clean_characters($distro) if $distro;
 	}
-	# otherwise try  the default debian/ubuntu /etc/issue file
+	# otherwise try  the default debian/ubuntu/distro /etc/issue file
 	elsif ($b_issue){
-		if ( !$distro_id && $etc_issue && $lc_issue =~ /(mint|lmde)/ ){
+		if (!$distro_id && $lc_issue && $lc_issue =~ /(mint|lmde)/){
 			$distro_id = $1;
-			$b_use_issue = 1;
+			$b_skip_issue = 1;
 		}
 		# os-release/lsb gives more manageable and accurate output than issue, 
 		# but mint should use issue for now. Antergos uses arch os-release, but issue shows them
-		if (!$b_use_issue && @osr){
+		if (!$b_skip_issue && @osr){
 			$distro = get_os_release();
-			$b_osr = 1;
+			$b_skip_osr = 1;
 		}
-		elsif (!$b_use_issue && $b_lsb){
+		elsif (!$b_skip_issue && $b_lsb){
 			$distro = get_lsb_release();
 		}
-		elsif ($etc_issue) {
-			$distro =  $etc_issue;
-			# this handles an arch bug where /etc/arch-release is empty and /etc/issue 
-			# is corrupted only older arch installs that have not been updated should 
-			# have this fallback required, new ones use os-release
-			if ( $distro =~ /arch linux/i){
-				$distro = 'Arch Linux';
+		elsif ($etc_issue){
+			if (-d '/etc/guix' && $lc_issue =~ /^this is the gnu system\./){
+				$distro = 'Guix';
+				# they didn't use any standard paths or files for os data, sigh, use pm version
+				my $version = main::program_version('guix', '^guix', '4','--version',1);
+				$distro .= " $version" if $version;
+				$b_skip_issue = 1;
+			}
+			else {
+				$distro =  $etc_issue;
+				# this handles an arch bug where /etc/arch-release is empty and /etc/issue 
+				# is corrupted only older arch installs that have not been updated should 
+				# have this fallback required, new ones use os-release
+				if ($distro =~ /arch linux/i){
+					$distro = 'Arch Linux';
+				}
 			}
 		}
 	}
 	# a final check. If a long value, before assigning the debugger output, if os-release
 	# exists then let's use that if it wasn't tried already. Maybe that will be better.
 	# not handling the corrupt data, maybe later if needed. 10 + distro: (8) + string
-	if ($distro && length($distro) > 60 ){
-		if (!$b_osr && @osr){
+	if ($distro && length($distro) > 60){
+		if (!$b_skip_osr && @osr){
 			$distro = get_os_release();
-			$b_osr = 1;
+			$b_skip_osr = 1;
 		}
 	}
 	# test for /etc/lsb-release as a backup in case of failure, in cases 
 	# where > one version/release file were found but the above resulted 
 	# in null distro value. 
 	if (!$distro){
-		if (!$b_osr && @osr){
+		if (!$b_skip_osr && @osr){
 			$distro = get_os_release();
-			$b_osr = 1;
+			$b_skip_osr = 1;
 		}
 		elsif ($b_lsb){
 			$distro = get_lsb_release();
 		}
 	}
 	# now some final null tries
-	if (!$distro ){
+	if (!$distro){
 		# if the file was null but present, which can happen in some cases, then use 
 		# the file name itself to set the distro value. Why say unknown if we have 
 		# a pretty good idea, after all?
@@ -20331,114 +23483,151 @@ sub get_linux_distro {
 			$distro = $distro_file;
 		}
 	}
-	if ($extra > 0){
-		my $base_arch_distro = 'anarchy|antergos|archbang|archlabs|archman|archstrike|arco|artix';
-		# note: arch linux derived distro page claims kaos as arch derived but it is NOT
-		$base_arch_distro .= '|blackarch|bluestar|chakra|ctios|endeavour|hyperbola|linhes';
-		$base_arch_distro .= '|manjaor|mysys2|netrunner\s?rolling|ninja|obarun|parabola';
-		$base_arch_distro .= '|puppyrus-?a|reborn|snal|talkingarch|ubos';
-		my $base_debian_version_distro = 'sidux';
-		my $base_debian_version_osr = '\belive|lmde|neptune|parrot|pureos|rescatux|septor|sparky|tails';
-		my $base_default = 'antix-version|mx-version'; # osr has base ids
-		my $base_issue = 'bunsen'; # base only found in issue
-		my $base_manual = 'blankon|deepin|kali'; # synthesize, no direct data available
-		my $base_osr = 'aptosid|grml|q4os|siduction|bodhi'; # osr base, distro id in list of distro files
-		my $base_osr_issue = 'grml|linux lite'; # osr base, distro id in issue
-		# osr has distro name but has ubuntu  ID_LIKE/UBUNTU_CODENAME
-		my $base_osr_ubuntu = 'mint|neon|nitrux|pop!_os|zorin'; 
-		my $base_upstream_lsb = '/etc/upstream-release/lsb-release';
-		my $base_upstream_osr = '/etc/upstream-release/os-release';
-		# first: try, some distros have upstream-release, elementary, new mint
-		# and anyone else who uses this method for fallback ID
-		if ( -r $base_upstream_osr){
-			my @osr_working = main::reader($base_upstream_osr);
-			if ( @osr_working){
-				my (@osr_temp);
-				@osr_temp = @osr;
-				@osr = @osr_working;
-				$system_base = get_os_release();
-				@osr = @osr_temp if !$system_base;
-				(@osr_temp,@osr_working) = (undef,undef);
-			}
-		}
-		elsif ( -r $base_upstream_lsb){
-			$system_base = get_lsb_release($base_upstream_lsb);
-		}
-		if (!$system_base && @osr){
-			my ($base_type) = ('');
-			if ($etc_issue && (grep {/($base_issue)/i} @osr)){
-				$system_base = $etc_issue;
-			}
-			# more tests added here for other ubuntu derived distros
-			elsif ( @distro_files && (grep {/($base_default)/} @distro_files) ){
-				$base_type = 'default';
-			}
-			# must go before base_osr_ubuntu test
-			elsif ( grep {/($base_debian_version_osr)/i} @osr ){
-				$system_base = debian_id();
-			}
-			elsif ( grep {/($base_osr_ubuntu)/i} @osr ){
-				$base_type = 'ubuntu';
-			}
-			elsif ( ( ($distro_id && $distro_id =~ /($base_osr_issue)/ ) || 
-			      (@distro_files && (grep {/($base_osr)/} @distro_files) ) ) && 
-			      !(grep {/($base_osr)/i} @osr)){
-				$system_base = get_os_release();
-			}
-			if (!$system_base && $base_type){
-				$system_base = get_os_release($base_type);
-			}
-		}
-		if (!$system_base && @distro_files && ( grep {/($base_debian_version_distro)/i} @distro_files ) ){
-			$system_base = debian_id();
-		}
-		if (!$system_base && $lc_issue && $lc_issue =~ /($base_manual)/){
-			my $id = $1;
-			my %manual = (
-			'blankon' => 'Debian unstable',
-			'deepin' => 'Debian unstable',
-			'kali' => 'Debian testing',
-			);
-			$system_base = $manual{$id};
-		}
-		if (!$system_base && $distro && $distro =~ /^($base_arch_distro)/i){
-			$system_base = 'Arch Linux';
-		}
-		if ($distro && -d '/etc/salixtools/' && $distro =~ /Slackware/i){
-			$system_base = $distro;
-		}
-	}
+	system_base() if $extra > 0;
+	# some last customized changes, double check if possible to verify still valid
 	if ($distro){
 		if ($distro_id eq 'armbian'){
 			$distro =~ s/Debian/Armbian/;
 		}
+		elsif ($distro_id eq 'raspios'){
+			$system_base = $distro;
+			# no need to repeat the debian version info if base:
+			if ($extra == 0){$distro =~ s/Debian\s*GNU\/Linux/Raspberry Pi OS/;}
+			else {$distro = 'Raspberry Pi OS';}
+		}
 		elsif (-d '/etc/salixtools/' && $distro =~ /Slackware/i){
 			$distro =~ s/Slackware/Salix/;
 		}
 	}
 	else {
 		# android fallback, sometimes requires root, sometimes doesn't
-		if ($b_android) {
-			main::set_build_prop() if !$b_build_prop;;
-			$distro = 'Android';
-			$distro .= ' ' . $build_prop{'build-version'} if $build_prop{'build-version'};
-			$distro .= ' ' . $build_prop{'build-date'} if $build_prop{'build-date'};
-			if (!$show{'machine'}){
-				if ($build_prop{'product-manufacturer'} && $build_prop{'product-model'}){
-					$distro .= ' (' . $build_prop{'product-manufacturer'} . ' ' . $build_prop{'product-model'} . ')';
-				}
-				elsif ($build_prop{'product-device'}){
-					$distro .= ' (' . $build_prop{'product-device'} . ')';
-				}
-				elsif ($build_prop{'product-name'}){
-					$distro .= ' (' . $build_prop{'product-name'} . ')';
-				}
-			}
-		}
+		android_info() if $b_android;
 	}
 	## finally, if all else has failed, give up
 	$distro ||= 'unknown';
-	@distro_data = ($distro,$system_base);
+	eval $end if $b_log;
+}
+
+sub android_info {
+	eval $start if $b_log;
+	main::set_build_prop() if !$loaded{'build-prop'};;
+	$distro = 'Android';
+	$distro .= ' ' . $build_prop{'build-version'} if $build_prop{'build-version'};
+	$distro .= ' ' . $build_prop{'build-date'} if $build_prop{'build-date'};
+	if (!$show{'machine'}){
+		if ($build_prop{'product-manufacturer'} && $build_prop{'product-model'}){
+			$distro .= ' (' . $build_prop{'product-manufacturer'} . ' ' . $build_prop{'product-model'} . ')';
+		}
+		elsif ($build_prop{'product-device'}){
+			$distro .= ' (' . $build_prop{'product-device'} . ')';
+		}
+		elsif ($build_prop{'product-name'}){
+			$distro .= ' (' . $build_prop{'product-name'} . ')';
+		}
+	}
+	eval $end if $b_log;
+}
+
+sub system_base_bsd {
+	eval $start if $b_log;
+	# ghostbsd is handled in main bsd section
+	if (lc($uname[1]) eq 'nomadbsd' && $distro_id eq 'freebsd'){
+		$system_base = $distro;
+		$distro = $uname[1];
+	}
+	elsif (-f '/etc/pkg/HardenedBSD.conf' && $distro_id eq 'freebsd'){
+		$system_base = $distro;
+		$distro = 'HardenedBSD';
+	}
+	elsif ($distro_id =~ /^(truenas)$/){
+		$system_base = "$uname[0] $uname[2]";
+	}
+	eval $end if $b_log;
+}
+
+sub system_base {
+	eval $start if $b_log;
+	my $base_arch_distro = 'anarchy|antergos|archbang|archlabs|archman|archstrike|arco|artix';
+	# note: arch linux derived distro page claims kaos as arch derived but it is NOT
+	$base_arch_distro .= '|blackarch|bluestar|chakra|ctios|endeavour|garuda|hyperbola|linhes';
+	$base_arch_distro .= '|manjaro|mysys2|netrunner\s?rolling|ninja|obarun|parabola';
+	$base_arch_distro .= '|puppyrus-?a|reborn|snal|talkingarch|ubos';
+	my $base_debian_version_distro = 'sidux';
+	my $base_debian_version_osr = '\belive|lmde|neptune|parrot|pureos|rescatux|septor|sparky|tails';
+	# osr has base ids
+	my $base_default = 'antix-version|mx-version'; 
+	# base only found in issue
+	my $base_issue = 'bunsen'; 
+	# synthesize, no direct data available
+	my $base_manual = 'blankon|deepin|kali'; 
+	# osr base, distro id in list of distro files
+	my $base_osr = 'aptosid|grml|q4os|siduction|bodhi'; 
+	# osr base, distro id in issue
+	my $base_osr_issue = 'grml|linux lite|openmediavault'; 
+	# osr has distro name but has ubuntu  ID_LIKE/UBUNTU_CODENAME
+	my $base_osr_ubuntu = 'mint|neon|nitrux|pop!_os|zorin'; 
+	my $base_upstream_lsb = '/etc/upstream-release/lsb-release';
+	my $base_upstream_osr = '/etc/upstream-release/os-release';
+	# first: try, some distros have upstream-release, elementary, new mint
+	# and anyone else who uses this method for fallback ID
+	if (-r $base_upstream_osr){
+		my @osr_working = main::reader($base_upstream_osr);
+		if (@osr_working){
+			my (@osr_temp);
+			@osr_temp = @osr;
+			@osr = @osr_working;
+			$system_base = get_os_release();
+			@osr = @osr_temp if !$system_base;
+			(@osr_temp,@osr_working) = (undef,undef);
+		}
+	}
+	elsif (-r $base_upstream_lsb){
+		$system_base = get_lsb_release($base_upstream_lsb);
+	}
+	if (!$system_base && @osr){
+		my ($base_type) = ('');
+		if ($etc_issue && (grep {/($base_issue)/i} @osr)){
+			$system_base = $etc_issue;
+		}
+		# more tests added here for other ubuntu derived distros
+		elsif (@distro_files && (grep {/($base_default)/} @distro_files)){
+			$base_type = 'default';
+		}
+		# must go before base_osr_ubuntu test
+		elsif (grep {/($base_debian_version_osr)/i} @osr){
+			$system_base = debian_id();
+		}
+		elsif (grep {/($base_osr_ubuntu)/i} @osr){
+			$base_type = 'ubuntu';
+		}
+		elsif ((($distro_id && $distro_id =~ /($base_osr_issue)/) || 
+		 (@distro_files && (grep {/($base_osr)/} @distro_files))) && 
+		 !(grep {/($base_osr)/i} @osr)){
+			$system_base = get_os_release();
+		}
+		if (!$system_base && $base_type){
+			$system_base = get_os_release($base_type);
+		}
+	}
+	if (!$system_base && @distro_files && 
+	 (grep {/($base_debian_version_distro)/i} @distro_files)){
+		$system_base = debian_id();
+	}
+	if (!$system_base && $lc_issue && $lc_issue =~ /($base_manual)/){
+		my $id = $1;
+		my %manual = (
+		'blankon' => 'Debian unstable',
+		'deepin' => 'Debian unstable',
+		'kali' => 'Debian testing',
+		);
+		$system_base = $manual{$id};
+	}
+	if (!$system_base && $distro && $distro =~ /^($base_arch_distro)/i){
+		$system_base = 'Arch Linux';
+	}
+	if ($distro && -d '/etc/salixtools/' && $distro =~ /Slackware/i){
+		$system_base = $distro;
+	}
 	eval $end if $b_log;
 }
 
@@ -20482,7 +23671,10 @@ sub get_lsb_release {
 		$distro = $description;
 	}
 	else {
-		$distro = "$id $release $codename";
+		# avoid duplicates
+		$distro = $id;
+		$distro .= " $release" if $distro !~ /$release/;
+		$distro .= " $codename" if $distro !~ /$codename/;
 		$distro =~ s/^\s+|\s\s+|\s+$//g; # get rid of double and trailing spaces 
 	}
 	eval $end if $b_log;
@@ -20515,7 +23707,7 @@ sub get_os_release {
 			$version_id = $working[1];
 		}
 		# for mint/zorin, other ubuntu base system base
-		if ($base_type ){
+		if ($base_type){
 			if ($working[0] eq 'ID_LIKE' && $working[1]){
 				if ($base_type eq 'ubuntu'){
 					# popos shows debian
@@ -20544,7 +23736,7 @@ sub get_os_release {
 			}
 			$distro .= " $version_name";
 		}
-		elsif ($pretty_name && ($pretty_name !~ /tumbleweed/i && $lc_name ne 'arcolinux') ){
+		elsif ($pretty_name && ($pretty_name !~ /tumbleweed/i && $lc_name ne 'arcolinux')){
 			$distro = $pretty_name;
 		}
 		elsif ($name){
@@ -20563,14 +23755,14 @@ sub get_os_release {
 			$base_id .= ' ' if $base_id;
 			$distro = "$base_name $base_id$base_version";
 		}
-		elsif ($base_type eq 'default' && ($pretty_name || ($name && $version_name) ) ){
+		elsif ($base_type eq 'default' && ($pretty_name || ($name && $version_name))){
 			$distro = ($name && $version_name) ? "$name $version_name" : $pretty_name;
 		}
 		# LMDE 2 has only limited data in os-release, no _LIKE values. 3 has like and debian_codename
-		elsif ( $base_type eq 'ubuntu' && $lc_name =~ /^(debian|ubuntu)/ && ($pretty_name || ($name && $version_name))){
+		elsif ($base_type eq 'ubuntu' && $lc_name =~ /^(debian|ubuntu)/ && ($pretty_name || ($name && $version_name))){
 			$distro = ($name && $version_name) ? "$name $version_name": $pretty_name;
 		}
-		elsif ( $base_type eq 'debian' && $base_version ){
+		elsif ($base_type eq 'debian' && $base_version){
 			$distro = debian_id($base_version);
 		}
 	}
@@ -20599,15 +23791,15 @@ sub debian_id {
 	'13' => 'trixie', 
 	);
 	if (main::is_numeric($debian_version)){
-		$id .= " $debian_version $debians{int($debian_version)}";
+		$id .= " $debian_version " . $debians{int($debian_version)};
 	}
-	elsif ($codename) {
+	elsif ($codename){
 		my %by_value = reverse %debians;
 		my $version = (main::is_numeric($debian_version)) ? "$debian_version $codename": $debian_version;
 		$id .= " $version";
 	}
 	# like buster/sid
-	elsif ($debian_version) {
+	elsif ($debian_version){
 		$id .= " $debian_version";
 	}
 	eval $end if $b_log;
@@ -20648,11 +23840,100 @@ sub ubuntu_id {
 	return $id;
 }
 }
+
+## DmidecodeData 
+{
+package DmidecodeData;
+# note, all actual tests have already been run in check_tools so if we
+# got here, we're good. 
+sub set {
+	eval $start if $b_log;
+	${$_[0]} = 1; # set check boolean by reference
+	if ($fake{'dmidecode'} || $alerts{'dmidecode'}->{'action'} eq 'use'){
+		generate_data();
+	}
+	eval $end if $b_log;
+}
+
+sub generate_data {
+	eval $start if $b_log;
+	my ($content,@data,@working,$type,$handle);
+	if ($fake{'dmidecode'}){
+		my $file;
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/pci-freebsd-8.2-2";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-loki-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-t41-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-mint-20180106.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-vmware-ram-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-tyan-4408.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ram/dmidecode-speed-configured-1.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ram/dmidecode-speed-configured-2.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/ram/00srv-dmidecode-mushkin-1.txt";
+		# open(my $fh, '<', $file) or die "can't open $file: $!";
+		# chomp(@data = <$fh>);
+	}
+	else {
+		$content = qx($alerts{'dmidecode'}->{'path'} 2>/dev/null);
+		@data = split('\n', $content);
+	}
+	# we don't need the opener lines of dmidecode output
+	# but we do want to preserve the indentation. Empty lines
+	# won't matter, they will be skipped, so no need to handle them.
+	# some dmidecodes do not use empty line separators
+	splice(@data, 0, 5) if @data;
+	my $j = 0;
+	my $b_skip = 1;
+	foreach (@data){
+		if (!/^Hand/){
+			next if $b_skip;
+			if (/^[^\s]/){
+				$_ = lc($_);
+				$_ =~ s/\s(information)//;
+				push(@working, $_);
+			}
+			elsif (/^\t/){
+				$_ =~ s/^\t\t/~/;
+				$_ =~ s/^\t|\s+$//g;
+				push(@working, $_);
+			}
+		}
+		elsif (/^Handle\s(0x[0-9A-Fa-f]+).*DMI\stype\s([0-9]+),.*/){
+			$j = scalar @dmi;
+			$handle = hex($1);
+			$type = $2;
+			$use{'slot-tool'} = 1 if $type && $type == 9;
+			$b_skip = ($type > 126) ? 1 : 0;
+			next if $b_skip;
+			# we don't need 32, system boot, or 127, end of table
+			if (@working){
+				if ($working[0] != 32 && $working[0] < 127){
+					$dmi[$j] = (
+					[@working],
+					);
+				}
+			}
+			@working = ($type,$handle);
+		}
+	}
+	if (@working && $working[0] != 32 && $working[0] != 127){
+		$j = scalar @dmi;
+		$dmi[$j] = \@working;
+	}
+	# last by not least, sort it by dmi type, now we don't have to worry
+	# about random dmi type ordering in the data, which happens. Also sort 
+	# by handle, as secondary sort.
+	@dmi = sort { $a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] } @dmi;
+	main::log_data('dump','@dmi',\@dmi) if $b_log;
+	print Data::Dumper::Dumper \@dmi if $dbg[2];
+	eval $end if $b_log;
+}
+}
+
 # return all device modules not including driver
 sub get_driver_modules {
 	eval $start if $b_log;
 	my ($driver,$modules) = @_;
-	return if ! $modules;
+	return if !$modules;
 	my @mods = split(/,\s+/, $modules);
 	if ($driver){
 		@mods = grep {!/^$driver$/} @mods;
@@ -20662,6 +23943,7 @@ sub get_driver_modules {
 	eval $end if $b_log;
 	return $modules;
 }
+
 # 1: driver; 2: modules, comma separated, return only modules 
 # which do not equal the driver string itself. Sometimes the module
 # name is different from the driver name, even though it's the same thing.
@@ -20670,7 +23952,7 @@ sub get_gcc_data {
 	my ($gcc,@data,@gccs,@temp);
 	# NOTE: We can't use program_version because we don't yet know where
 	# the version number is
-	if (my $program = check_program('gcc') ){
+	if (my $program = check_program('gcc')){
 		@data = grabber("$program --version 2>/dev/null");
 		$gcc = awk(\@data,'^gcc');
 	}
@@ -20695,37 +23977,51 @@ sub get_gcc_data {
 	return @gccs;
 }
 
-# rasberry pi only
-sub get_gpu_ram_arm {
+## GlabelData - set/get
+# used only to get RAID ZFS gptid path standard name, like ada0p1
+{
+package GlabelData;
+# gptid/c5e940f1-5ce2-11e6-9eeb-d05099ac4dc2     N/A  ada0p1
+sub get {
 	eval $start if $b_log;
-	my ($gpu_ram) = (0);
-	if (my $program = check_program('vcgencmd')){
-		# gpu=128M
-		# "VCHI initialization failed" - you need to add video group to your user
-		my $working = (grabber("$program get_mem gpu 2>/dev/null"))[0];
-		$working = (split(/\s*=\s*/, $working))[1] if $working;
-		$gpu_ram = translate_size($working) if $working;
+	my ($gptid) = @_;
+	set() if !$loaded{'glabel'};
+	return if !@glabel || !$gptid;
+	my ($dev_id) = ('');
+	foreach (@glabel){
+		my @temp = split(/\s+/, $_);
+		my $gptid_trimmed = $gptid;
+		# slice off s[0-9] from end in case they use slice syntax
+		$gptid_trimmed =~ s/s[0-9]+$//;
+		if (defined $temp[0] && ($temp[0] eq $gptid || $temp[0] eq $gptid_trimmed)){
+			$dev_id = $temp[2];
+			last;
+		}
 	}
-	log_data('data',"gpu ram: $gpu_ram") if $b_log;
+	$dev_id ||= $gptid; # no match? return full string
 	eval $end if $b_log;
-	return $gpu_ram;
+	return $dev_id;
 }
-
-# standard systems
-sub get_gpu_ram {
+sub set {
 	eval $start if $b_log;
-	my ($gpu_ram) = (0);
+	$loaded{'glabel'} = 1;
+	if (my $path = main::check_program('glabel')){
+		@glabel = main::grabber("$path status 2>/dev/null");
+	}
+	main::log_data('dump','@glabel:with Headers',\@glabel) if $b_log;
+	# get rid of first header line
+	shift @glabel;
 	eval $end if $b_log;
-	return $gpu_ram;
+}
 }
 
 sub get_hostname {
 	eval $start if $b_log;
 	my $hostname = '';
-	if ( $ENV{'HOSTNAME'} ){
+	if ($ENV{'HOSTNAME'}){
 		$hostname = $ENV{'HOSTNAME'};
 	}
-	elsif ( !$bsd_type && -r "/proc/sys/kernel/hostname" ){
+	elsif (!$bsd_type && -r "/proc/sys/kernel/hostname"){
 		$hostname = reader('/proc/sys/kernel/hostname','',0);
 	}
 	# puppy removed this from core modules, sigh
@@ -20734,7 +24030,7 @@ sub get_hostname {
 		Sys::Hostname->import;
 		$hostname = Sys::Hostname::hostname();
 	}
-	elsif (my $program = check_program('hostname')) {
+	elsif (my $program = check_program('hostname')){
 		$hostname = (grabber("$program 2>/dev/null"))[0];
 	}
 	$hostname ||= 'N/A';
@@ -20747,19 +24043,19 @@ sub get_init_data {
 	my $runlevel = get_runlevel_data();
 	my $default = ($extra > 1) ? get_runlevel_default() : '';
 	my ($init,$init_version,$rc,$rc_version,$program) = ('','','','','');
-	my $comm = ( -r '/proc/1/comm' ) ? reader('/proc/1/comm','',0) : '';
+	my $comm = (-r '/proc/1/comm') ? reader('/proc/1/comm','',0) : '';
 	my (@data);
 	# this test is pretty solid, if pid 1 is owned by systemd, it is systemd
 	# otherwise that is 'init', which covers the rest of the init systems.
 	# more data may be needed for other init systems.
-	if ( $comm ){
-		if ( $comm =~ /systemd/ ){
+	if ($comm){
+		if ($comm =~ /systemd/){
 			$init = 'systemd';
-			if ( $program = check_program('systemd')){
-				$init_version = program_version($program,'^systemd','2','--version');
+			if ($program = check_program('systemd')){
+				$init_version = program_version($program,'^systemd','2','--version',1);
 			}
-			if (!$init_version && ($program = check_program('systemctl') ) ){
-				$init_version = program_version($program,'^systemd','2','--version');
+			if (!$init_version && ($program = check_program('systemctl'))){
+				$init_version = program_version($program,'^systemd','2','--version',1);
 			}
 		}
 		# epoch version == Epoch Init System 1.0.1 "Sage"
@@ -20774,6 +24070,10 @@ sub get_init_data {
 		elsif ($comm =~ /runit/){
 			$init = 'runit';
 		}
+		elsif ($comm =~ /shepherd/){
+			$init = 'Shepherd';
+			$init_version = program_version('shepherd', '^shepherd', '4','--version',1);
+		}
 		elsif ($comm =~ /^s6/){
 			$init = 's6';
 		}
@@ -20782,24 +24082,25 @@ sub get_init_data {
 		# output: /sbin/init --version:  init (upstart 1.1)
 		# init (upstart 0.6.3)
 		# openwrt /sbin/init hangs on --version command, I think
-		if ((!$b_mips && !$b_sparc && !$b_arm) && ($init_version = program_version('init', 'upstart', '3','--version') )){
+		if ((!$b_mips && !$b_sparc && !$b_arm) && 
+		 ($init_version = program_version('init', 'upstart', '3','--version'))){
 			$init = 'Upstart';
 		}
 		elsif (check_program('launchctl')){
 			$init = 'launchd';
 		}
-		elsif ( -f '/etc/inittab' ){
+		elsif (-f '/etc/inittab'){
 			$init = 'SysVinit';
 			if (check_program('strings')){
 				@data = grabber('strings /sbin/init');
 				$init_version = awk(\@data,'^version\s+[0-9]',2);
 			}
 		}
-		elsif ( -f '/etc/ttys' ){
+		elsif (-f '/etc/ttys'){
 			$init = 'init (BSD)';
 		}
 	}
-	if ( grep { /openrc/ } globber('/run/*openrc*') ){
+	if ((grep { /openrc/ } globber('/run/*openrc*')) || (grep {/openrc/} @ps_cmd)){
 		$rc = 'OpenRC';
 		# /sbin/openrc --version == openrc (OpenRC) 0.13
 		if ($program = check_program('openrc')){
@@ -20809,13 +24110,13 @@ sub get_init_data {
 		elsif ($program = check_program('rc')){
 			$rc_version = program_version($program, '^rc', '3','--version');
 		}
-		if ( -r '/run/openrc/softlevel' ){
+		if (-r '/run/openrc/softlevel'){
 			$runlevel = reader('/run/openrc/softlevel','',0);
 		}
-		elsif ( -r '/var/run/openrc/softlevel'){
+		elsif (-r '/var/run/openrc/softlevel'){
 			$runlevel = reader('/var/run/openrc/softlevel','',0);
 		}
-		elsif ( $program = check_program('rc-status')){
+		elsif ($program = check_program('rc-status')){
 			$runlevel = (grabber("$program -r 2>/dev/null"))[0];
 		}
 	}
@@ -20831,6 +24132,175 @@ sub get_init_data {
 	return %init;
 }
 
+## IpData
+{
+package IpData;
+sub set {
+	eval $start if $b_log;
+	if ($alerts{'ip'}->{'action'} eq 'use'){
+		set_ip_addr();
+	}
+	elsif ($alerts{'ifconfig'}->{'action'} eq 'use'){
+		set_ifconfig();
+	}
+	eval $end if $b_log;
+}
+
+sub set_ip_addr {
+	eval $start if $b_log;
+	my @data = main::grabber($alerts{'ip'}->{'path'} . " addr 2>/dev/null",'\n','strip');
+	# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/if/scope-ipaddr-1.txt";
+	# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/networking/ip-addr-blue-advance.txt";
+	# my @data = reader($file,'strip') or die $!;
+	my ($b_skip,$broadcast,$if,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
+	foreach (@data){
+		if (/^[0-9]/){
+			# print "$_\n";
+			if (@ips){
+			# print "$if\n";
+				@temp = ($if,[@ips]);
+				push(@ifs,@temp);
+				@ips = ();
+			}
+			@temp = split(/:\s+/, $_);
+			$if = $temp[1];
+			if ($if eq 'lo'){
+				$b_skip = 1;
+				$if = '';
+				next;
+			}
+			$b_skip = 0;
+			@temp = ();
+		}
+		elsif (!$b_skip && /^inet/){
+			# print "$_\n";
+			@temp = split(/\s+/, $_);
+			($broadcast,$ip,$scope,$if_id,$type) = ('','','','','');
+			$ip = $temp[1];
+			$type = ($temp[0] eq 'inet') ? 4 : 6 ;
+			if ($temp[2] eq 'brd'){
+				$broadcast = $temp[3];
+			}
+			if (/scope\s([^\s]+)(\s(.+))?/){
+				$scope = $1;
+				$if_id = $3;
+			}
+			@temp = ($type,$ip,$broadcast,$scope,$if_id);
+			push(@ips,[@temp]);
+			# print Data::Dumper::Dumper \@ips;
+		}
+	}
+	# print Data::Dumper::Dumper \@ips if $dbg[4];
+	if (@ips){
+		@temp = ($if,[@ips]);
+		push(@ifs,@temp);
+	}
+	main::log_data('dump','@ifs',\@ifs) if $b_log;
+	print Data::Dumper::Dumper \@ifs if $dbg[3];
+	eval $end if $b_log;
+}
+
+sub set_ifconfig {
+	eval $start if $b_log;
+	my @data = main::grabber($alerts{'ifconfig'}->{'path'} . " 2>/dev/null",'\n','');
+	# my @data = reader("$ENV{'HOME'}/bin/scripts/inxi/data/if/vps-ifconfig-1.txt",'') or die $!;
+	my ($b_skip,$broadcast,$if,@ips_bsd,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
+	my ($state,$speed,$duplex,$mac);
+	foreach (@data){
+		if (/^[\S]/i){
+			# print "$_\n";
+			if (@ips){
+			# print "here\n";
+				@temp = ($if,[@ips]);
+				push(@ifs,@temp);
+				@ips = ();
+			}
+			if ($mac){
+				@temp = ($if,[($state,$speed,$duplex,$mac)]);
+				push(@ifs_bsd,@temp);
+				($state,$speed,$duplex,$mac,$if_id) = ('','','','','');
+			}
+			$if = (split(/\s+/, $_))[0];
+			$if =~ s/:$//; # em0: flags=8843
+			$if_id = $if;
+			$if = (split(':', $if))[0] if $if;
+			if ($if =~ /^lo/){
+				$b_skip = 1;
+				$if = '';
+				$if_id = '';
+				next;
+			}
+			$b_skip = 0;
+		}
+		elsif (!$b_skip && $bsd_type && /^\s+(address|ether|media|status|lladdr)/){
+			$_ =~ s/^\s+//;
+			# freebsd 7.3: media: Ethernet 100baseTX <full-duplex>
+			# Freebsd 8.2/12.2: media: Ethernet autoselect (1000baseT <full-duplex>) 
+			# Netbsd 9.1: media: Ethernet autoselect (1000baseT full-duplex) 
+			# openbsd: media: Ethernet autoselect (1000baseT full-duplex)
+			if (/^media/){
+				if ($_ =~ /[\s\(]([1-9][^\(\s]+)?\s<([^>]+)>/){
+					$speed = $1 if $1;
+					$duplex = $2;
+				}
+				if (!$duplex && $_ =~ /\s\(([\S]+)\s([^\s<]+)\)/){
+					$speed = $1;
+					$duplex = $2;
+				}
+				if (!$speed && $_ =~ /\s\(([1-9][\S]+)\s/){
+					$speed = $1;
+				}
+			}
+			# lladdr openbsd/address netbsd/ether freebsd
+			elsif (!$mac && /^(address|ether|lladdr)/){
+				$mac = (split(/\s+/, $_))[1];
+			}
+			elsif (/^status:\s*(.*)/){
+				$state = $1;
+			}
+		}
+		elsif (!$b_skip && /^\s+inet/){
+			# print "$_\n";
+			$_ =~ s/^\s+//;
+			$_ =~ s/addr:\s/addr:/;
+			@temp = split(/\s+/, $_);
+			($broadcast,$ip,$scope,$type) = ('','','','');
+			$ip = $temp[1];
+			# fe80::225:90ff:fe13:77ce%em0
+# 			$ip =~ s/^addr:|%([\S]+)//;
+			if ($1 && $1 ne $if_id){
+				$if_id = $1;
+			}
+			$type = ($temp[0] eq 'inet') ? 4 : 6 ;
+			if (/(Bcast:|broadcast\s)([\S]+)/){
+				$broadcast = $2;
+			}
+			if (/(scopeid\s[^<]+<|Scope:|scopeid\s)([^>]+)[>]?/){
+				$scope = $2;
+			}
+			$scope = 'link' if $ip =~ /^fe80/;
+			@temp = ($type,$ip,$broadcast,$scope,$if_id);
+			push(@ips,[@temp]);
+			# print Data::Dumper::Dumper \@ips;
+		}
+	}
+	if (@ips){
+		@temp = ($if,[@ips]);
+		push(@ifs,@temp);
+	}
+	if ($mac){
+		@temp = ($if,[($state,$speed,$duplex,$mac)]);
+		push(@ifs_bsd,@temp);
+		($state,$speed,$duplex,$mac) = ('','','','');
+	}
+	print Data::Dumper::Dumper \@ifs if $dbg[3];
+	print Data::Dumper::Dumper \@ifs_bsd if $dbg[3];
+	main::log_data('dump','@ifs',\@ifs) if $b_log;
+	main::log_data('dump','@ifs_bsd',\@ifs_bsd) if $b_log;
+	eval $end if $b_log;
+}
+}
+
 sub get_kernel_data {
 	eval $start if $b_log;
 	my ($kernel,$ksplice) = ('','');
@@ -20838,7 +24308,7 @@ sub get_kernel_data {
 	# FreeBSD; siwi.pair.com; 8.2-STABLE; FreeBSD 8.2-STABLE #0: Tue May 31 14:36:14 EDT 2016     erik5@iddhi.pair.com:/usr/obj/usr/src/sys/82PAIRx-AMD64; amd64
 	if (@uname){
 		$kernel = $uname[2];
-		if ( (my $program = check_program('uptrack-uname')) && $kernel){
+		if ((my $program = check_program('uptrack-uname')) && $kernel){
 			$ksplice = qx($program -rm);
 			$ksplice = trimmer($ksplice);
 			$kernel = ($ksplice) ? $ksplice . ' (ksplice)' : $kernel;
@@ -20862,42 +24332,49 @@ sub get_kernel_bits {
 	# fallback test
 	if (!$bits && @uname){
 		$bits = $uname[-1];
-		$bits = ($bits =~ /64/ ) ? 64 : 32;
+		$bits = ($bits =~ /64/) ? 64 : 32;
 	}
 	$bits ||= 'N/A';
 	eval $end if $b_log;
 	return $bits;
 }
 
-sub get_kernel_parameters {
+## KernelParameters
+{
+package KernelParameters;
+sub get {
 	eval $start if $b_log;
 	my ($parameters);
-	if (my $file = system_files('cmdline') ) {
-		$parameters = get_kernel_parameters_linux($file);
+	if (my $file = $system_files{'proc-cmdline'}){
+		$parameters = parameters_linux($file);
 	}
-	elsif ($bsd_type) {
-		$parameters = get_kernel_parameters_bsd();
+	elsif ($bsd_type){
+		$parameters = parameters_bsd();
 	}
 	eval $end if $b_log;
 	return $parameters;
 }
-sub get_kernel_parameters_linux {
+sub parameters_linux {
 	eval $start if $b_log;
 	my ($file) = @_;
 	# unrooted android may have file only root readable
-	my $line = reader($file,'',0) if -r $file;
+	my $line = main::reader($file,'',0) if -r $file;
 	eval $end if $b_log;
 	return $line;
 }
-sub get_kernel_parameters_bsd {
+sub parameters_bsd {
 	eval $start if $b_log;
 	my ($parameters);
 	eval $end if $b_log;
 	return $parameters;
 }
+}
 
+## LsblkData - set/get
+{
+package LsblkData;
 # 1 - partition name
-sub get_lsblk {
+sub get {
 	eval $start if $b_log;
 	my $item = $_[0];
 	return if !@lsblk;
@@ -20911,71 +24388,165 @@ sub get_lsblk {
 	eval $start if $b_log;
 	return %device;
 }
-
-sub get_memory_data_full {
+sub set {
 	eval $start if $b_log;
-	my ($source) = @_;
-	my $num = 0;
-	my ($memory,@rows);
-	my ($gpu_ram,$percent,$total,$used) = (0,'','','');
-	if ($show{'ram'} || (!$show{'info'} && $show{'process'} )){
-		$memory = get_memory_data('splits');
-		if ($memory){
-			my @temp = split(':', $memory);
-			$gpu_ram = $temp[3] if $temp[3];
-			$total = ($temp[0]) ? get_size($temp[0],'string') : 'N/A';
-			$used = ($temp[1]) ? get_size($temp[1],'string') : 'N/A';
-			$used .= " ($temp[2]%)" if $temp[2];
-			if ($gpu_ram){
-				$gpu_ram = get_size($gpu_ram,'string');
+	$loaded{'lsblk'} = 1;
+	if ($alerts{'lsblk'} && $alerts{'lsblk'}->{'path'}){
+		# check to see if lsblk removes : - separators from accepted input syntax
+		my $cmd = $alerts{'lsblk'}->{'path'} . ' -bP --output NAME,TYPE,RM,FSTYPE,';
+		$cmd .= 'SIZE,LABEL,UUID,SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,';
+		$cmd .= 'MAJ:MIN,PKNAME 2>/dev/null';
+		print "cmd: $cmd\n" if $dbg[32];
+		my @working = main::grabber($cmd);
+		print Data::Dumper::Dumper \@working if $dbg[32];
+		# note: lsblk 2.37 changeed - and : to _ in the output.
+		my $pattern = 'NAME="([^"]*)"\s+TYPE="([^"]*)"\s+RM="([^"]*)"\s+';
+		$pattern .= 'FSTYPE="([^"]*)"\s+SIZE="([^"]*)"\s+LABEL="([^"]*)"\s+';
+		$pattern .= 'UUID="([^"]*)"\s+SERIAL="([^"]*)"\s+MOUNTPOINT="([^"]*)"\s+';
+		$pattern .= 'PHY[_-]SEC="([^"]*)"\s+LOG[_-]SEC="([^"]*)"\s+';
+		$pattern .= 'PARTFLAGS="([^"]*)"\s+MAJ[:_-]MIN="([^"]*)"\s+PKNAME="([^"]*)"';
+		foreach (@working){
+			if (/$pattern/){
+				my $size = ($5) ? $5/1024: 0;
+				# some versions of lsblk do not return serial, fs, uuid, or label
+				push(@lsblk, {
+				'name' => $1, 
+				'type' => $2,
+				'rm' => $3, 
+				'fs' => $4, 
+				'size' => $size,
+				'label' => $6,
+				'uuid' => $7,
+				'serial' => $8,
+				'mount' => $9,
+				'block-physical' => $10,
+				'block-logical' => $11,
+				'partition-flags' => $12,
+				'maj-min' => $13,
+				'parent' => $14,
+				});
+				# must be below assignments!! otherwise the result of the match replaces values
+				# note: for bcache and luks, the device that has that fs is the parent!!
+				if ($show{'logical'}){
+					$use{'logical-lvm'} = 1 if !$use{'logical-lvm'} && $2 && $2 eq 'lvm';
+					if (!$use{'logical-general'} && (($4 && ($4 eq 'crypto_LUKS' || $4 eq 'bcache')) 
+					    || ($2 && ($2 eq 'dm' && $1 =~ /veracrypt/i) || 
+					    $2 eq 'crypto' || $2 eq 'mpath' || $2 eq 'multipath'))){
+						$use{'logical-general'} = 1;
+					}
+				}
 			}
 		}
-		my $key = ($source eq 'process') ? 'System RAM': 'RAM';
-		$rows[0]->{main::key($num++,1,1,$key)} = '';
-		$rows[0]->{main::key($num++,0,2,'total')} = $total;
-		$rows[0]->{main::key($num++,0,2,'used')} = $used;
-		$rows[0]->{main::key($num++,0,2,'gpu')} = $gpu_ram if $gpu_ram;
-		$b_mem = 1;
 	}
+	print Data::Dumper::Dumper \@lsblk if $dbg[32];
+	main::log_data('dump','@lsblk',\@lsblk) if $b_log;
+	eval $end if $b_log;
+}
+}
+
+sub set_mapper {
+	eval $start if $b_log;
+	$loaded{'mapper'} = 1;
+	return if ! -d '/dev/mapper';
+	foreach ((globber('/dev/mapper/*'))){
+		my ($key,$value) = ($_,Cwd::abs_path("$_"));
+		next if !$value;
+		$key =~ s|^/.*/||;
+		$value =~ s|^/.*/||;
+		$mapper{$key} = $value;
+	}
+	%dmmapper = reverse %mapper if %mapper;
 	eval $end if $b_log;
-	return @rows;
 }
 
-sub get_memory_data {
+## MemoryData
+{
+package MemoryData;
+
+sub get {
 	eval $start if $b_log;
 	my ($type) = @_;
 	my ($memory);
-	if (my $file = system_files('meminfo') ) {
-		$memory = get_memory_data_linux($type,$file);
+	# note: netbsd 8.0 has meminfo!
+	$loaded{'memory'} = 1;
+	# netbsd uses meminfo, but it uses it in a weird way
+	if (!$force{'vmstat'} && (!$bsd_type || ($force{'meminfo'} && $bsd_type)) && 
+	 (my $file = $system_files{'proc-meminfo'})){
+		$memory = meminfo_data($type,$file);
 	}
 	else {
-		$memory = get_memory_data_bsd($type);
+		$memory = bsd_data($type);
 	}
 	eval $end if $b_log;
 	return $memory;
 }
-
-sub get_memory_data_linux {
+sub full {
+	eval $start if $b_log;
+	my ($source) = @_;
+	my $num = 0;
+	my ($memory,@rows);
+	my ($gpu_ram,$percent,$total,$used) = (0,'','','');
+	$loaded{'memory'} = 1;
+	$memory = get('splits');
+	if ($memory){
+		my @temp = split(':', $memory);
+		$gpu_ram = $temp[3] if $temp[3];
+		$total = ($temp[0]) ? main::get_size($temp[0],'string') : 'N/A';
+		$used = ($temp[1]) ? main::get_size($temp[1],'string') : 'N/A';
+		$used .= " ($temp[2]%)" if $temp[2];
+		if ($gpu_ram){
+			$gpu_ram = main::get_size($gpu_ram,'string');
+		}
+	}
+	my $key = ($source eq 'process') ? 'System RAM': 'RAM';
+	$rows[0]->{main::key($num++,1,1,$key)} = '';
+	$rows[0]->{main::key($num++,0,2,'total')} = $total;
+	$rows[0]->{main::key($num++,0,2,'used')} = $used;
+	$rows[0]->{main::key($num++,0,2,'gpu')} = $gpu_ram if $gpu_ram;
+	eval $end if $b_log;
+	return @rows;
+}
+sub meminfo_data {
 	eval $start if $b_log;
 	my ($type,$file) = @_;
-	my ($available,$gpu,$memory,$not_used,$total) = (0,0,'',0,0);
-	my @data = reader($file);
+	my ($available,$buffers,$cached,$free,$gpu,$memory,$not_used,$total) = (0,0,0,0,0,'',0,0);
+	my @data = main::reader($file);
 	foreach (@data){
 		if ($_ =~ /^MemTotal:/){
-			$total = get_piece($_,2);
+			$total = main::get_piece($_,2);
+		}
+		elsif ($_ =~ /^MemFree:/){
+			$free = main::get_piece($_,2); 
 		}
-		elsif ($_ =~ /^(MemFree|Buffers|Cached):/){
-			$not_used += get_piece($_,2);
+		elsif ($_ =~ /^Buffers:/){
+			$buffers = main::get_piece($_,2); 
+		}
+		elsif ($_ =~ /^Cached:/){
+			$cached = main::get_piece($_,2); 
 		}
 		elsif ($_ =~ /^MemAvailable:/){
-			$available = get_piece($_,2);
+			$available = main::get_piece($_,2);
 		}
 	}
-	$not_used = $available if $available;
-	$gpu = get_gpu_ram_arm() if $b_arm;
-	#$gpu = translate_size('128M');
+	$gpu = gpu_ram_arm() if $b_arm;
+	#$gpu = main::translate_size('128M');
 	$total += $gpu;
-	my $used = $total - ($not_used);
+	if ($available){
+		$not_used = $available;
+	}
+	# seen fringe cases, where total - free+buff+cach < 0
+	# the idea is that the OS must be using 10MiB of ram or more
+	elsif (($total - ($free + $buffers + $cached)) > 10000){
+		$not_used = ($free + $buffers + $cached);
+	}
+	# netbsd goes < 0, but it's wrong, so dump the cache
+	elsif (($total - ($free + $buffers)) > 10000){
+		$not_used = ($free + $buffers);
+	}
+	else {
+		$not_used = $free;
+	}
+	my $used = ($total - $not_used);
 	my $percent = ($used && $total) ? sprintf("%.1f", ($used/$total)*100) : '';
 	if ($type eq 'string'){
 		$percent = " ($percent%)" if $percent;
@@ -20984,7 +24555,7 @@ sub get_memory_data_linux {
 	else {
 		$memory = "$total:$used:$percent:$gpu";
 	}
-	log_data('data',"memory: $memory") if $b_log;
+	main::log_data('data',"memory: $memory") if $b_log;
 	eval $end if $b_log;
 	return $memory;
 }
@@ -20993,7 +24564,7 @@ sub get_memory_data_linux {
 # procs    memory       page                    disks    traps          cpu
 # r b w    avm     fre  flt  re  pi  po  fr  sr wd0 wd1  int   sys   cs us sy id
 # 0 0 0  55256 1484092  171   0   0   0   0   0   2   0   12   460   39  3  1 96
-## openbsd 6.3? added in M, sigh...
+## openbsd 6.3? added in M/G/T etc, sigh...
 # 2 57 55M 590M 789 0 0 0...
 ## freebsd:
 # procs      memory      page                    disks     faults         cpu
@@ -21001,43 +24572,45 @@ sub get_memory_data_linux {
 # 0 0 0  21880M  6444M   924  32  11   0   822 827   0   0  853  832  463  8  3 88
 # with -H
 # 2 0 0 14925812  936448    36  13  10   0    84  35   0   0   84   30   42 11  3 86
-## dragonfly
+## dragonfly: V1, supported -H
 #  procs      memory      page                    disks     faults      cpu
 #  r b w     avm    fre  flt  re  pi  po  fr  sr ad0 ad1   in   sy  cs us sy id
 #  0 0 0       0  84060 30273993 2845 12742 1164 407498171 320960902   0   0 ....
-sub get_memory_data_bsd {
+## dragonfly: V2, no avm, no -H support
+sub bsd_data {
 	eval $start if $b_log;
 	my ($type) = @_;
 	my $memory = '';
-	my ($avm,$av_pages,$cnt,$fre,$free_mem,$real_mem,$total) = (3,0,0,4,0,0,0);
+	my ($avm,$av_pages,$cnt,$fre,$free_mem,$mult,$real_mem,$total) = (0,0,0,0,0,0,0,0);
 	my (@data,$message);
-	my $arg = ($bsd_type ne 'openbsd') ? '-H' : '';
-	if (my $program = check_program('vmstat')){
+	# my $arg = ($bsd_type ne 'openbsd' && $bsd_type ne 'dragonfly') ? '-H' : '';
+	if (my $program = main::check_program('vmstat')){
 		# see above, it's the last line. -H makes it hopefully all in kB so no need 
-		# for K/M/G tests
-		my @vmstat = grabber("vmstat $arg 2>/dev/null",'\n','strip');
+		# for K/M/G tests, note that -H not consistently supported, so don't use.
+		my @vmstat = main::grabber("vmstat 2>/dev/null",'\n','strip');
+		main::log_data('dump','@vmstat',\@vmstat) if $b_log;
 		my @header = split(/\s+/, $vmstat[1]);
-		foreach ( @header){
+		foreach (@header){
 			if ($_ eq 'avm'){$avm = $cnt}
 			elsif ($_ eq 'fre'){$fre = $cnt}
 			elsif ($_ eq 'flt'){last;}
 			$cnt++;
 		}
 		my $row = $vmstat[-1];
-		if ( $row ){
+		if ($row){
 			@data = split(/\s+/, $row);
-			# 6.3 introduced an M character, sigh.
-			if ($data[$avm] && $data[$avm] =~ /^([0-9]+)M$/){
-				$data[$avm] = $1 * 1024;
+			# openbsd 6.3, dragonfly 5.x introduced an M / G character, sigh.
+			if ($avm > 0 && $data[$avm] && $data[$avm] =~ /^([0-9\.]+[KGMT])(iB|B)?$/){
+				$data[$avm] = main::translate_size($1);
 			}
-			if ($data[$fre] && $data[$fre] =~ /^([0-9]+)M$/){
-				$data[$fre] = $1 * 1024;
+			if ($fre > 0 && $data[$fre] && $data[$fre] =~ /^([0-9\.]+[KGMT])(iB|B)?$/){
+				$data[$fre] = main::translate_size($1);
 			}
-			# dragonfly can have 0 avg, but they may fix that so make test dynamic
-			if ($data[$avm] != 0){
-				$av_pages = ($bsd_type ne 'openbsd') ? sprintf('%.1f',$data[$avm]/1024) : $data[$avm];
+			# dragonfly can have 0 avg, or no avm, sigh, but they may fix that so make test dynamic
+			if ($avm > 0 && $data[$avm] != 0){
+				$av_pages = ($bsd_type !~ /^(net|open)bsd$/) ? sprintf('%.1f',$data[$avm]/1024) : $data[$avm];
 			}
-			elsif ($data[$fre] != 0){
+			if ($fre > 0 && $data[$fre] != 0){
 				$free_mem = sprintf('%.1f',$data[$fre]);
 			}
 		}
@@ -21046,23 +24619,25 @@ sub get_memory_data_bsd {
 	if ($alerts{'sysctl'}->{'action'} eq 'use'){
 		# for dragonfly, we will use free mem, not used because free is 0
 		my @working;
-		foreach (@sysctl){
-			# freebsd seems to use bytes here
-			if (!$real_mem && /^hw.physmem:/){
-				@working = split(/:\s*/, $_);
-				#if ($working[1]){
-					$working[1] =~ s/^[^0-9]+|[^0-9]+$//g;
-					$real_mem = sprintf("%.1f", $working[1]/1024);
-				#}
-				last if $free_mem;
-			}
-			# But, it uses K here. Openbsd/Dragonfly do not seem to have this item
-			# this can be either: Free Memory OR Free Memory Pages
-			elsif (/^Free Memory:/){
-				@working = split(/:\s*/, $_);
-				$working[1] =~ s/[^0-9]+//g;
-				$free_mem = sprintf("%.1f", $working[1]);
-				last if $real_mem;
+		if ($sysctl{'memory'}){
+			foreach (@{$sysctl{'memory'}}){
+				# freebsd seems to use bytes here
+				if (!$real_mem && /^hw.physmem:/){
+					@working = split(/:\s*/, $_);
+					# if ($working[1]){
+						$working[1] =~ s/^[^0-9]+|[^0-9]+$//g;
+						$real_mem = sprintf("%.1f", $working[1]/1024);
+					# }
+					last if $free_mem;
+				}
+				# But, it uses K here. Openbsd/Dragonfly do not seem to have this item
+				# this can be either: Free Memory OR Free Memory Pages
+				elsif (/^Free Memory:/){
+					@working = split(/:\s*/, $_);
+					$working[1] =~ s/[^0-9]+//g;
+					$free_mem = sprintf("%.1f", $working[1]);
+					last if $real_mem;
+				}
 			}
 		}
 	}
@@ -21077,21 +24652,19 @@ sub get_memory_data_bsd {
 		my $used = (!$free_mem) ? $av_pages : $real_mem - $free_mem;
 		if ($type eq 'string'){
 			$used = sprintf("%.1f",$used/1024);
-			$memory = "$used/($error) MB";
+			$memory = "$used/($error) MiB";
 		}
 		else {
 			$memory = "$error:$used:";
 		}
 	}
 	# use openbsd/dragonfly avail mem data if available
-	elsif (($av_pages || $free_mem) && $real_mem) {
+	elsif (($av_pages || $free_mem) && $real_mem){
 		my $used = (!$free_mem) ? $av_pages : $real_mem - $free_mem;
 		my $percent = ($used && $real_mem) ? sprintf("%.1f", ($used/$real_mem)*100) : '';
 		if ($type eq 'string'){
-			$used = sprintf("%.1f",$used/1024);
-			$real_mem = sprintf("%.1f",$real_mem/1024);
 			$percent = " ($percent)" if $percent;
-			$memory = "$used/$real_mem MB" . $percent;
+			$memory = sprintf("%.1f/%.1f MiB", $used/1024, $real_mem/1024) . $percent;
 		}
 		else {
 			$memory = "$real_mem:$used:$percent:0";
@@ -21100,11 +24673,34 @@ sub get_memory_data_bsd {
 	eval $end if $b_log;
 	return $memory;
 }
+# rasberry pi only
+sub gpu_ram_arm {
+	eval $start if $b_log;
+	my ($gpu_ram) = (0);
+	if (my $program = main::check_program('vcgencmd')){
+		# gpu=128M
+		# "VCHI initialization failed" - you need to add video group to your user
+		my $working = (main::grabber("$program get_mem gpu 2>/dev/null"))[0];
+		$working = (split(/\s*=\s*/, $working))[1] if $working;
+		$gpu_ram = main::translate_size($working) if $working;
+	}
+	main::log_data('data',"gpu ram: $gpu_ram") if $b_log;
+	eval $end if $b_log;
+	return $gpu_ram;
+}
+# standard systems, not used currently, but maybe one day?
+sub get_gpu_ram {
+	eval $start if $b_log;
+	my ($gpu_ram) = (0);
+	eval $end if $b_log;
+	return $gpu_ram;
+}
+}
 
 sub get_module_version {
 	eval $start if $b_log;
 	my ($module) = @_;
-	return if ! $module;
+	return if !$module;
 	my ($version);
 	my $path = "/sys/module/$module/version";
 	if (-r $path){
@@ -21113,8 +24709,8 @@ sub get_module_version {
 	elsif (-f "/sys/module/$module/uevent"){
 		$version = 'kernel';
 	}
-	#print "version:$version\n";
-	if (!$version) {
+	# print "version:$version\n";
+	if (!$version){
 		if (my $path = check_program('modinfo')){
 			my @data = grabber("$path $module 2>/dev/null");
 			$version = awk(\@data,'^version',2,':\s+') if @data;
@@ -21124,9 +24720,10 @@ sub get_module_version {
 	eval $end if $b_log;
 	return $version;
 }
+
+## PackageData
 # Note: this outputs the key/value pairs ready to go and is
 # called from either -r or -Ix, -r precedes. 
-## Get PackageData
 {
 package PackageData;
 my ($count,%counts,@list,$num,%output,$program,$type);
@@ -21134,7 +24731,8 @@ $counts{'total'} = 0;
 sub get {
 	eval $start if $b_log;
 	# $num passed by reference to maintain incrementing where requested
-	($type,$num) = @_; 
+	($type,$num) = @_;
+	$loaded{'packages'} = 1;
 	package_counts();
 	appimage_counts();
 	create_output();
@@ -21148,13 +24746,18 @@ sub create_output {
 		$total = $counts{'total'};
 	}
 	else {
-		if ($type eq 'inner'){$total = 'N/A';}
-		else {$total = main::row_defaults('packages','');}
+		if ($type eq 'inner' || $counts{'note'}){
+			$total = 'N/A';
+		}
+		else {
+			$total = main::row_defaults('package-data');
+		}
 	}
 	if ($counts{'total'} && $extra > 1){
 		delete $counts{'total'};
 		my $b_mismatch;
 		foreach (keys %counts){
+			next if $_ eq 'note';
 			if ($counts{$_}->[0] && $counts{$_}->[0] != $total){
 				$b_mismatch = 1;
 				last;
@@ -21163,6 +24766,10 @@ sub create_output {
 		$total = '' if !$b_mismatch;
 	}
 	$output{main::key($$num++,1,1,'Packages')} = $total;
+	# if blocked pm secondary, only show if admin
+	if ($counts{'note'} && (!$counts{'total'} || $b_admin || $total < 100)){
+		$output{main::key($$num++,0,2,'note')} = $counts{'note'};
+	}
 	if ($extra > 1 && %counts){
 		foreach (sort keys %counts){
 			my ($cont,$ind) = (1,2);
@@ -21199,21 +24806,40 @@ sub package_counts {
 	['emerge','emerge','d','/var/db/pkg/*/*/',1,5,'\\/'],
 	['eopkg','eopkg','d','/var/lib/eopkg/package/*',1,5,'\\/'],
 	['guix-sys','guix','p','package -p "/run/current-system/profile" -I',1,0,''],
-	['guix-usr','guix','p','package package -I',1,0,''],
-	['pacman','pacman','p','-Qq --color never',1,0,''],
+	['guix-usr','guix','p','package -I',1,0,''],
+	['kiss','kiss','p','list',1,0,''],
+	['mport','mport','p','list',1,0,''],
+	['nix-sys','nix-store','p','-qR /run/current-system/sw',1,1,'-'], 
+	['nix-usr','nix-store','p','-qR ~/.nix-profile',1,1,'-'], 
+	['nix-default','nix-store','p','-qR /nix/var/nix/profiles/default',1,2,'-'], 
+	['pacman','pacman','p','-Qq --color never',1,0,'',
+	 '!main::check_program(\'pacman-g2\')'], # pacman-g2 has sym link to pacman
 	['pacman-g2','pacman-g2','p','-Q',1,0,''],
 	['pkg','pkg','d','/var/db/pkg/*',1,0,''], # 'pkg list' returns non programs
 	['pkg_info','pkg_info','p','',1,0,''],
-	['pkgtool','pkgtool','d','/var/log/packages/*',1,4,'\\/'],
-	# way too slow without nodigest/sig!! confirms packages exist
-	['rpm','rpm','p','-qa --nodigest --nosignature',1,0,''],
+	# like cards, avoid pkginfo directly due to python pm being so slow
+	# but pkgadd is also found in scratch
+	['pkgutils','pkginfo','p','-i',1,0,'','main::check_program(\'pkgadd\')'],
+	# slack 15 moves packages to /var/lib/pkgtools/packages but links to /var/log/packages
+	['pkgtool','pkgtool','d','/var/lib/pkgtools/packages',1,4,'\\/',
+	 '-d \'/var/lib/pkgtools/packages\''],
+	['pkgtool','pkgtool','d','/var/log/packages/',1,5,'\\/',
+	 '! -d \'/var/lib/pkgtools/packages\' && -d \'/var/log/packages/\''],
+	# rpm way too slow without nodigest/sig!! confirms packages exist
+	# but even with, MASSIVELY slow in some cases, > 20, 30 seconds!!!!
+	# find another way to get rpm package counts or don't show this feature for rpm!!
+	['rpm','rpm','pkg','-qa --nodigest --nosignature',1,0,''],
+	# scratch is a programming language too, with software called scratch
+	['scratch','pkgbuild','d','/var/lib/scratchpkg/index/*/.pkginfo',1,5,'\\/',
+	 '-d \'/var/lib/scratchpkg\''],
 	# note',' slapt-get, spkg, and pkgtool all return the same count
-	#['slapt-get','slapt-get','p','--installed',1,0,''],
-	#['spkg','spkg','p','--installed',1,0,''],
+	# ['slapt-get','slapt-get','p','--installed',1,0,''],
+	# ['spkg','spkg','p','--installed',1,0,''],
 	['tce','tce-status','p','-i',1,0,''],
 	# note: I believe mageia uses rpm internally but confirm
 	# ['urpmi','urpmq','p','??',1,0,''], 
 	['xbps','xbps-query','p','-l',1,1,''],
+	# ['xxx-brew','brew','p','--cellar',0,0,''], # verify how this works
 	['zzz-flatpak','flatpak','p','list',0,0,''],
 	['zzz-snap','snap','p','list',0,0,'','@ps_cmd && (grep {/\bsnapd\b/} @ps_cmd)'],
 	);
@@ -21221,32 +24847,42 @@ sub package_counts {
 	foreach (@pkg_managers){
 		if ($program = main::check_program($_->[1])){
 			next if $_->[7] && !eval $_->[7];
-			if ($_->[2] eq 'p'){
+			my $error;
+			if ($_->[2] eq 'p' || ($_->[2] eq 'pkg' && $force{'pkg'})){
 				chomp(@list = qx($program $_->[3] 2>/dev/null));
 			}
-			else {
+			elsif ($_->[2] eq 'd'){
 				@list = main::globber($_->[3]);
 			}
+			else {
+				@list = undef;
+				$error = main::row_defaults('pm-disabled');
+			}
 			$libs = undef;
-			$count = scalar @list;
-			#print Data::Dumper::Dumper \@list;
-			if ($b_admin && $count && $_->[4]){
-				$libs = count_libs(\@list,$_->[5],$_->[6]);
+			# print Data::Dumper::Dumper \@list;
+			if (!$error){
+				$count = scalar @list;
+				if ($b_admin && $count && $_->[4]){
+					$libs = count_libs(\@list,$_->[5],$_->[6]);
+				}
+				$counts{$_->[0]} = [$count,$libs];
+				$counts{'total'} += $count;
 			}
-			$counts{$_->[0]} = ([$count,$libs]);
-			$counts{'total'} += $count;
-			#print Data::Dumper::Dumper \%counts;
+			else {
+				$counts{'note'} = $error;
+			}
+			# print Data::Dumper::Dumper \%counts;
 		}
 	}
 	# print Data::Dumper::Dumper \%counts;
-	main::log_data('dump','Packaage managers: %counts',\%counts) if $b_log;
+	main::log_data('dump','Package managers: %counts',\%counts) if $b_log;
 	eval $end if $b_log;
 }
 sub appimage_counts {
 	if (@ps_cmd && (grep {/\bappimaged\b/} @ps_cmd)){
 		@list = main::globber($ENV{'HOME'} . '/.local/bin/*.appimage');
 		$count = scalar @list;
-		$counts{'zzz-appimage'} = ([$$count,undef]) if $count;
+		$counts{'zzz-appimage'} = [$count,undef] if $count;
 		$counts{'total'} += $count;
 	}
 }
@@ -21255,16 +24891,58 @@ sub count_libs {
 	my (@data);
 	my $i = 0;
 	$split ||= '\\s+';
-	#print scalar @$items, '::', $split, '::', $pos, "\n";
+	# print scalar @$items, '::', $split, '::', $pos, "\n";
 	foreach (@$items){
 		@data = split(/$split/, $_);
-		#print scalar @data, '::', $data[$pos], "\n";
+		# print scalar @data, '::', $data[$pos], "\n";
 		$i++ if $data[$pos] && $data[$pos] =~ m%^lib%;
 	}
 	return $i;
 }
 }
 
+## PartitionData - set/get
+# for /proc/partitions only, see DiskDataBSD for BSD partition data.
+{
+package PartitionData;
+sub set {
+	my ($type) = @_;
+	$loaded{'partition-data'} = 1;
+	if (my $file = $system_files{'proc-partitions'}){
+		proc_data($file);
+	}
+}
+# 1 - partition name, without /dev, like sda1, sde
+sub get {
+	eval $start if $b_log;
+	my $item = $_[0];
+	return if !@proc_partitions;
+	my (@device);
+	foreach my $device (@proc_partitions){
+		if ($device->[3] eq $item){
+			@device = @$device;
+			last;
+		}
+	}
+	eval $start if $b_log;
+	return @device;
+}
+
+sub proc_data {
+	eval $start if $b_log;
+	my $file = $_[0];
+	my @parts = main::reader($file,'strip');
+	# print Dumper \@parts;
+	shift @parts if @parts; # get rid of headers
+	for (@parts){
+		my @temp = split(/\s+/, $_);
+		next if !defined $temp[2];
+		push (@proc_partitions,[$temp[0],$temp[1],$temp[2],$temp[3]]);
+	}
+	eval $end if $b_log;
+}
+}
+
 # args: 1 - pci device string; 2 - pci cleaned subsystem string
 sub get_pci_vendor {
 	eval $start if $b_log;
@@ -21291,30 +24969,125 @@ sub get_pci_vendor {
 	return $vendor;
 }
 
-# 1 - partition name, without /dev, like sda1, sde
-sub get_proc_partition {
+sub set_ps_aux {
 	eval $start if $b_log;
-	my $item = $_[0];
-	return if !@proc_partitions;
-	my (@device);
-	foreach my $device (@proc_partitions){
-		if ($device->[3] eq $item){
-			@device = @$device;
-			last;
+	my ($header,@ps,@temp);
+	# note: some ps cut off output based on terminal width
+	# ww sets width unlimited
+	$loaded{'ps-aux'} = 1;
+	@ps = grabber("ps wwaux 2>/dev/null",'','strip');
+	if (@ps){
+		$header = shift @ps; # get rid of header row
+		# handle busy box, which has 3 columns, regular ps aux has 11
+		# avoid deprecated implicit split error in older Perls
+		@temp = split(/\s+/, $header);
+	}
+	$ps_cols = $#temp; # the indexes, not the scalar count
+	if ($ps_cols < 10){
+		my $version = qx(ps --version 2>&1);
+		$b_busybox_ps = 1 if $version =~ /busybox/i;
+	}
+	return if !@ps; # note: mips/openwrt ps has no 'a'
+	for (@ps){
+		next if !$_;
+		next if $self_name eq 'inxi' && /\/$self_name\b/;
+		$_ = lc;
+		push (@ps_aux,$_);
+		my @split = split(/\s+/, $_);
+		# slice out 10th to last elements of ps aux rows
+		my $final = $#split;
+		# some stuff has a lot of data, chrome for example
+		$final = ($final > ($ps_cols + 2)) ? $ps_cols + 2 : $final;
+		if ($split[$ps_cols] !~ /^\[/){
+			push(@ps_cmd,join(' ', @split[$ps_cols .. $final]));
 		}
 	}
+	# never, because ps loaded before option handler
+	# print Dumper \@ps_cmd; # if $dbg[5];
+	eval $end if $b_log;
+}
+
+sub set_ps_gui {
 	eval $start if $b_log;
-	return @device;
+	$loaded{'ps-gui'} = 1;
+	my ($working,@match,@temp);
+	# desktops / wm (some wm also compositors)
+	if ($show{'system'}){
+		@temp=qw(razor-desktop razor-session lxsession lxqt-session 
+		tdelauncher tdeinit_phase1);
+		push(@match,@temp);
+		@temp=qw(2bwm 3dwm 9wm afterstep aewm aewm\+\+ amiwm antiwm awesome
+		blackbox bspwm 
+		cagebreak calmwm catwm (sh|c?lisp).*clfswm ctwm (openbsd-)?cwm dwm evilwm 
+		fluxbox flwm flwm_topside fvwm.*-crystal fvwm1 fvwm2 fvwm3 fvwm95 fvwm 
+		herbstluftwm i3 icewm instantwm ion3 jbwm jwm larswm leftwm lwm 
+		matchbox-window-manager mcwm mini monsterwm musca mwm nawm notion 
+		openbox orbital pekwm penrose perceptia python.*qtile qtile qvwm ratpoison 
+		sawfish scrotwm snapwm spectrwm (sh|c?lisp).*stumpwm sway 
+		tinywm tvtwm twm uwm
+		waycooler way-cooler windowlab WindowMaker wingo wm2 wmfs wmfs2 wmii2 wmii 
+		wmx 
+		xfdesktop xmonad yeahwm);
+		push(@match,@temp);
+	}
+	# wm:
+	if ($show{'system'} && $extra > 1){
+		@temp=qw(budgie-wm compiz deepin-wm gala gnome-shell
+		twin kwin_wayland kwin_x11 kwin marco 
+		deepin-metacity metacity metisse mir muffin deepin-mutter mutter
+		ukwm xfwm[45]?);
+		push(@match,@temp);
+		# startx: /bin/sh /usr/bin/startx
+		@temp=qw(ly .*startx xinit); # possible dm values
+		push(@match,@temp);
+	}
+	# info: NOTE: glx-dock is cairo-dock
+	if ($show{'system'} && $extra > 2){
+		@temp=qw(alltray awn bar bmpanel bmpanel2 budgie-panel 
+		cairo-dock dde-dock dmenu dockbarx docker docky dzen dzen2
+		fbpanel fspanel glx-dock gnome-panel hpanel i3bar icewmtray 
+		kdocker kicker latte latte-dock lemonbar ltpanel lxpanel lxqt-panel 
+		matchbox-panel mate-panel ourico
+		perlpanel plank plasma-desktop plasma-netbook polybar pypanel
+		razor-panel razorqt-panel stalonetray swaybar taskbar tint2 trayer
+		ukui-panel vala-panel wbar wharf wingpanel witray 
+		xfce[45]?-panel xmobar yabar);
+		push(@match,@temp);
+	}
+	# compositors (for wayland these are also the server, note.
+	# for wayland always show, so always load these
+	if ($show{'graphic'} && $extra > 0){
+		@temp=qw(3dwm asc budgie-wm compiz compton deepin-wm dwc dcompmgr 
+		enlightenment fireplace gnome-shell grefson kmscon kwin_wayland kwin_x11
+		liri marco metisse mir moblin motorcar muffin mutter
+		orbital papyros perceptia picom rustland sommelier sway swc
+		ukwm unagi unity-system-compositor
+		wavy waycooler way-cooler wayfire wayhouse westford weston xcompmgr 
+		xfwm[45]?);
+		push(@match,@temp);
+	}
+	uniq(\@match);
+	my $matches = join('|', @match);
+	foreach (@ps_cmd){
+		if (/^(|[\S]*\/)($matches)(\/|\s|$)/){
+			$working = $2;
+			push(@ps_gui, $working); # deal with duplicates with uniq
+		}
+	}
+	uniq(\@ps_gui) if @ps_gui;
+	print Dumper \@ps_gui if $dbg[5];
+	log_data('dump','@ps_gui',\@ps_gui) if $b_log;
+	eval $end if $b_log;
 }
 
 # # check? /var/run/nologin for bsds?
 sub get_runlevel_data {
 	eval $start if $b_log;
 	my $runlevel = '';
-	if ( my $program = check_program('runlevel')){
+	if (my $program = check_program('runlevel')){
 		$runlevel = (grabber("$program 2>/dev/null"))[0];
 		$runlevel =~ s/[^\d]//g if $runlevel;
-		#print_line($runlevel . ";;");
+		# print_line($runlevel . ";;");
 	}
 	eval $end if $b_log;
 	return $runlevel;
@@ -21332,7 +25105,7 @@ sub get_runlevel_default {
 	my $systemd = '/etc/systemd/system/default.target';
 	my $upstart = '/etc/init/rc-sysinit.conf';
 	# note: systemd systems do not necessarily have this link created
-	if ( -e $systemd){
+	if (-e $systemd){
 		$default = readlink($systemd);
 		$default =~ s/.*\/// if $default; 
 		$b_systemd = 1;
@@ -21340,13 +25113,13 @@ sub get_runlevel_default {
 	# http://askubuntu.com/questions/86483/how-can-i-see-or-change-default-run-level
 	# note that technically default can be changed at boot but for inxi purposes 
 	# that does not matter, we just want to know the system default
-	elsif ( -r $upstart){
+	elsif (-r $upstart){
 		# env DEFAULT_RUNLEVEL=2
 		@data = reader($upstart);
 		$default = awk(\@data,'^env\s+DEFAULT_RUNLEVEL',2,'=');
 	}
 	# handle weird cases where null but inittab exists
-	if (!$default && -r $inittab ){
+	if (!$default && -r $inittab){
 		@data = reader($inittab);
 		$default = awk(\@data,'^id.*initdefault',2,':');
 	}
@@ -21357,7 +25130,7 @@ sub get_runlevel_default {
 sub get_self_version {
 	eval $start if $b_log;
 	my $patch = $self_patch;
-	if ( $patch ne '' ){
+	if ($patch ne ''){
 		# for cases where it was for example: 00-b1 clean to -b1
 		$patch =~ s/^[0]+-?//;
 		$patch = "-$patch" if $patch;
@@ -21366,50 +25139,248 @@ sub get_self_version {
 	return $self_version . $patch;
 }
 
-sub get_shell_data {
+## ServiceData
+{
+package ServiceData;
+my ($key,$service,$type);
+sub get {
 	eval $start if $b_log;
-	my ($ppid) = @_;
-	my $cmd = "ps -p $ppid -o comm= 2>/dev/null";
-	my $shell = qx($cmd);
-	log_data('cmd',$cmd) if $b_log;
+	($type,$service) = @_;
+	my $value;
+	set() if !$loaded{'service-tool'};
+	$key = (keys %service_tool)[0] if %service_tool;
+	if ($key){
+		if ($type eq 'status'){
+			$value = process_status();
+		}
+		elsif ($type eq 'tool'){
+			$value = $service_tool{$key}->[1];
+		}
+	}
+	eval $end if $b_log;
+	return $value;
+}
+sub process_status {
+	eval $start if $b_log;
+	my ($cmd,$status,@data);
+	my ($result,$value) = ('','');
+	my %translate = (
+	'active' => 'running',
+	'down' => 'stopped',
+	'fail' => 'not found', 
+	'failed' => 'not found', 
+	'inactive' => 'stopped',
+	'ok' => 'running',
+	'not running' => 'stopped',
+	'run' => 'running',
+	'started' => 'running',
+	);
+	if ($key eq 'systemctl'){
+		$cmd = "$service_tool{$key}->[0] status $service";
+	}
+	# can be /etc/init.d or /etc/rc.d; ghostbsd/gentoo have this
+	elsif ($key eq 'rc-service'){
+		$cmd = "$service_tool{$key}->[0] $service status";
+	}
+	elsif ($key eq 'rcctl'){
+		$cmd = "$service_tool{$key}->[0] check $service";
+	}
+	# dragonfly/netbsd/freebsd have this
+	elsif ($key eq 'service'){
+		$cmd = "$service_tool{$key}->[0] $service status";
+	}
+	# runit
+	elsif ($key eq 'sv'){
+		$cmd = "$service_tool{$key}->[0] status $service";
+	}
+	# check or status or onestatus (netbsd)
+	elsif ($key eq 'rc.d'){
+		if (-e "$service_tool{$key}->[0]$service"){
+			$status =  ($bsd_type && $bsd_type =~ /(dragonfly)/) ? 'status' : 'check';
+			$cmd = "$service_tool{$key}->[0]$service check";
+		}
+		else {
+			$result = 'not found';
+		}
+	}
+	elsif ($key eq 'init.d'){
+		if (-e "$service_tool{$key}->[0]$service"){
+			$cmd = "$service_tool{$key}->[0]$service status";
+		}
+		else {
+			$result = 'not found';
+		}
+	}
+	@data = main::grabber("$cmd  2>&1",'','strip') if $cmd;
+	# @data = ('bluetooth is running.');
+	print "key: $key\n", Data::Dumper::Dumper \@data if $dbg[29];
+	main::log_data('dump','service @data',\@data) if $b_log;
+	for my $row (@data){
+		my @working = split(/\s*:\s*/,$row);
+		($value) = ('');
+		# print "$working[0]::$working[1]\n";
+		if ($working[0] eq 'Loaded'){
+			# note: sshd shows ssh for ssh.service
+			$working[1] =~ /^(.+?)\s*\(.*?\.service;\s+(\S+?);.*/;
+			$result = lc($1) if $1;
+			$result = lc($2) if $2; # this will be enabled/disabled
+		}
+		elsif ($working[0] eq 'Active'){
+			$working[1] =~ /^(.+?)\s*\((\S+?)\).*/;
+			$value = lc($1) if $1 && (!$result || $result ne 'disabled');
+			$value = $translate{$value} if $value && $translate{$value};
+			$result .= ",$value" if ($result && $value);
+			last;
+		}
+		# valid syntax, but service does not exist
+		# * rc-service: service 'ntp' does not exist :: 
+		elsif ($row =~ /$service.*?(not (exist|(be )?found)|no such (directory|file)|unrecognized)/i){
+			$result = 'not found';
+			last;
+		}
+		# means command directive doesn't exist, we don't know if service exists or not
+		# * ntpd: unknown function 'disable' :: 
+		elsif ($row =~ /unknown (directive|function)|Usage/i){
+			last;
+		}
+		# rc-service: * status: started :: * status: stopped, fail handled in not exist test
+		elsif ($working[0] eq '* status' && $working[1]){
+			$result = lc($working[1]);
+			$result = $translate{$result} if $translate{$result};
+			last;
+		}
+		## start exists status detections
+		elsif ($working[0] =~ /\b$service is ([a-z\s]+?)(\s+as\s.*|\s+\.\.\..*)?\.?$/){
+			$result = lc($1);
+			$result = $translate{$result} if $translate{$result};
+			last;
+		}
+		# runit sv: run/down/fail - fail means not found
+		# run: udevd: (pid 631) 641s :: down: sshd: 9s, normally up
+		elsif ($working[1] && $working[1] eq $service && $working[0] =~ /^([a-z]+)$/){
+			$result = lc($1);
+			$result = $translate{$result} if $translate{$result};
+			$result = "enabled,$result" if $working[2] && $working[2] =~ /normally up/i;
+		}
+		# OpenBSD: sshd(ok)
+		elsif ($working[0] =~ /\b$service\s*\(([^\)]+)\)/){
+			$result = lc($1);
+			$result = $translate{$result} if $translate{$result};
+			last;
+		}
+	}
+	print "service result: $result\n" if $dbg[29];
+	main::log_data('data',"result: $result") if $b_log;
+	eval $end if $b_log;
+	return $result;
+}
+sub set {
+	eval $start if $b_log;
+	$loaded{'service-tool'} = 1;
+	my ($path);
+	if ($path = main::check_program('systemctl')){
+		# systemctl status ssh :: Loaded: / Active: 
+		%service_tool = ('systemctl' => [$path,'systemctl']);
+	}
+	elsif ($path = main::check_program('rc-service')){
+		# rc-service ssh status ::  * status: stopped
+		%service_tool = ('rc-service' => [$path,'rc-service']);
+	}
+	elsif ($path = main::check_program('rcctl')){
+		# rc-service ssh status ::  * status: stopped
+		%service_tool = ('rcctl' => [$path,'rcctl']);
+	}
+	elsif ($path = main::check_program('service')){
+		# service sshd status
+		%service_tool = ('service' => [$path,'service']);
+	}
+	elsif ($path = main::check_program('sv')){
+		# service sshd status
+		%service_tool = ('sv' => [$path,'sv']);
+	}
+	# freebsd does not have 'check', netbsd does not have status
+	elsif (-d '/etc/rc.d/'){
+		# /etc/rc.d/ssh check :: ssh(ok|failed)
+		%service_tool = ('rc.d' => ['/etc/rc.d/','/etc/rc.d']); 
+	}
+	elsif (-d '/etc/init.d/'){
+		# /etc/init.d/ssh status :: Loaded: loaded (...)/ Active: active (...)
+		%service_tool = ('init.d' => ['/etc/init.d/','/etc/init.d']);
+	}
+	eval $end if $b_log;
+}
+}
+# $dbg[29] = 1; set_path(); print ServiceData::get('status','bluetooth'),"\n";
+
+## ShellData
+{
+package ShellData;
+my $b_debug = 0; # disable all debugger output in case forget to comment out!
+
+# public. This does not depend on using ps -jfp, open/netbsd do not 
+# at this point support it, so we only want to use -jp to get parent
+# $ppid set in initialize(). shell_launcher will use -f so it only 
+# runs in case we got $pppid. $client{'pppid'} will be used to trigger
+# launcher tests. If started with sshd via ssh user@address 'pinxi -Ia'
+# will show sshd as shell, which is fine, that's what it is.
+sub set {
+	eval $start if $b_log;
+	my ($cmd,$parent,$pppid,$shell);
+	$loaded{'shell-data'} = 1;
+	$cmd = "ps -wwp $ppid -o comm= 2>/dev/null";
+	$shell = qx($cmd);
+	# we'll be using these $client pppid/parent values in shell_launcher() 
+	$pppid = $client{'pppid'} = get_pppid($ppid);
+	$pppid ||= ''; 
+	$client{'pppid'} ||= '';
+	# print "sh: $shell\n";
+	main::log_data('cmd',$cmd) if $b_log;
 	chomp($shell);
 	if ($shell){
-		#print "shell pre: $shell\n";
+		# print "shell pre: $shell\n";
 		# when run in debugger subshell, would return sh as shell,
 		# and parent as perl, that is, pinxi itself, which is actually right.
 		# trim leading /.../ off just in case. ps -p should return the name, not path 
 		# but at least one user dataset suggests otherwise so just do it for all.
 		$shell =~ s/^.*\///; 
-		my $working = $ENV{'SHELL'};
 		# NOTE: su -c "inxi -F" results in shell being su
-		if ($shell eq 'sudo' || $shell eq 'su' ){
-			$client{'su-start'} = $shell;
-			$shell = get_shell_parent(get_start_parent($ppid));
-		}
+		# but: su - results in $parent being su
+		my $i=0;
+		$parent = $client{'parent'} = parent_name($pppid) if $pppid;
+		$parent ||= '';
+		print "1: shell: $shell $ppid parent: $parent $pppid\n" if $b_debug;
+ 		# this will fail in this case: sudo su -c 'inxi -Ia'
+		if ($shell =~ /^(doas|login|sudo|su)$/){
+			$client{'su-start'} = $shell if $shell ne 'login';
+			$shell = $parent if $parent;
+		}
+		# eg: su to root, then sudo
+		elsif ($parent && $client{'parent'} =~ /^(doas|sudo|su)$/){
+			$client{'su-start'} = $parent;
+			$parent = '';
+		}
+		print "2: shell: $shell parent: $parent\n" if $b_debug;
+		my $working = $ENV{'SHELL'};
 		if ($working){
 			$working =~ s/^.*\///;
-# 			if (($shell eq 'sh' || $shell eq 'sudo' || $shell eq 'su' ) && $shell ne $working){
-# 				$client{'su-start'} = $shell if ($shell eq 'sudo' || $shell eq 'su');
-# 				$shell = $working;
-# 			}
 			# a few manual changes for known 
 			# Note: parent when fizsh shows as zsh but SHELL is fizsh, but other times
 			# SHELL is default shell, but in zsh, SHELL is default shell, not zfs
-			if ($shell eq 'zsh' && $working eq 'fizsh' ){
+			if ($shell eq 'zsh' && $working eq 'fizsh'){
 				$shell = $working;
 			}
 		}
-		# print "shell post: $shell working: $working\n";
+		# print "3: shell post: $shell working: $working\n";
 		# since there are endless shells, we'll keep a list of non program value
 		# set shells since there is little point in adding those to program values
-		if (test_shell($shell)){
+		if (shell_test($shell)){
 			# do nothing, just leave $shell as is
 		}
 		# note: not all programs return version data. This may miss unhandled shells!
-		elsif ((@app = program_data(lc($shell),lc($shell),1)) && $app[0]){
+		elsif ((@app = main::program_data(lc($shell),lc($shell),1)) && $app[0]){
 			$shell = $app[0];
 			$client{'version'} = $app[1] if $app[1]; 
-			#print "app test $shell v: $client{'version'}\n";
+			print "3: app test $shell v: $client{'version'}\n" if $b_debug;
 		}
 		else {
 			# NOTE: we used to guess here with position 2 --version but this cuold lead
@@ -21418,36 +25389,36 @@ sub get_shell_data {
 			# eg: shell -> infos -> inxi -> sh -> infos --version -> infos -> inxi...
 			# Basically here we are hoping that the grandparent is a shell, or at least
 			# recognized as a known possible program
-			#print "app not shell?: $shell\n";
+			# print "app not shell?: $shell\n";
 			if ($shell){
-				# print 'shell: ' . $shell .' Start client version type: ', get_shell_parent(get_start_parent(getppid())), "\n";
-				my $parent = get_shell_parent(get_start_parent($ppid));
+				 print "shell 4: $shell StartClientVersionType: $parent\n" if $b_debug;
 				if ($parent){
-					if (test_shell($parent)){
+					if (shell_test($parent)){
 						$shell = $parent;
 					}
-					elsif ((@app = program_data(lc($parent),lc($parent),0)) && $app[0]){
+					elsif ((@app = main::program_data(lc($parent),lc($parent),0)) && $app[0]){
 						$shell = $app[0];
 						$client{'version'} = $app[1] if $app[1];
 					}
-					#print "shell3: $shell version: $client{'version'}\n";
+					print "shell 5: $shell version: $client{'version'}\n" if $b_debug;
 				}
 			}
 			else {
-				$client{'version'} = row_defaults('unknown-shell');
+				$client{'version'} = main::row_defaults('unknown-shell');
 			}
-			#print "shell not app version: $client{'version'}\n";
+			print "6: shell not app version: $client{'version'}\n" if $b_debug;
 		}
 		$client{'version'} ||= '';
 		$client{'version'} =~ s/(\(.*|-release|-version)// if $client{'version'};
+		$shell =~ s/^[\s-]+|[\s-]+$//g if $shell; # sometimes will be like -sh
 		$client{'name'} = lc($shell);
 		$client{'name-print'} = $shell;
-		#print "shell4: $client{'name-print'} version: $client{'version'}\n";
+		print "7: shell: $client{'name-print'} version: $client{'version'}\n" if $b_debug;
 		if ($extra > 2 && $working && lc($shell) ne lc($working)){
-			if (@app = program_data(lc($working))){
+			if (@app = main::program_data(lc($working))){
 				$client{'default-shell'} = $app[0];
 				$client{'default-shell-v'} = $app[1];
-				$client{'default-shell-v'} =~ s/(\(.*|-release|-version)// if $client{'default-shell-v'};
+				$client{'default-shell-v'} =~ s/(\s*\(.*|-release|-version)// if $client{'default-shell-v'};
 			}
 			else {
 				$client{'default-shell'} = $working;
@@ -21458,115 +25429,130 @@ sub get_shell_data {
 		$client{'name'} = 'shell';
 		$client{'name-print'} = 'Unknown Shell';
 	}
-	$client{'su-start'} = 'sudo' if (!$client{'su-start'} && $ENV{'SUDO_USER'});
+	if (!$client{'su-start'}){
+		$client{'su-start'} = 'sudo' if $ENV{'SUDO_USER'};
+		$client{'su-start'} = 'doas' if $ENV{'DOAS_USER'};
+	}
+	if ($parent && $parent eq 'login'){
+		$client{'su-start'} = ($client{'su-start'}) ? $client{'su-start'} . ',' . $parent: $parent;
+	}
 	eval $end if $b_log;
 }
-# list of program_values non-handled shells, or known to have no version
-# Move shell to set_program_values for print name, or version if available
-sub test_shell {
-	my ($test) = @_;
-	# not verified or tested
-	my $shells = 'apush|ccsh|ch|esh|eshell|heirloom|hush|';
-	$shells .= 'ion|imrsh|larryshell|mrsh|msh(ell)?|murex|nsh|nu(shell)?|';
-	$shells .= 'psh|pwsh|pysh(ell)?|rush|sash|';
-	# tested shells with no version info discovered
-	$shells .= 'es|rc|scsh|sh';
-	return '|' . $shells if $test eq 'return';
-	return ($test =~ /^($shells)$/) ? $test : '';
-}
-
-sub get_shell_source {
+# public, returns shell launcher, terminal, program, whatever
+# depends on $pppid so only runs if that is set.
+sub shell_launcher {
 	eval $start if $b_log;
 	my (@data);
-	my ($msg,$self_parent,$shell_parent) = ('','','');
-	my $ppid = getppid();
-	$self_parent = get_start_parent($ppid);
+	my ($msg,$pppid,$shell_parent) = ('','','');
+	$pppid = $client{'pppid'};
 	if ($b_log){
-		$msg = ($ppid) ? "self parent: $self_parent ppid: $ppid": "self parent: undefined";
-		log_data('data',$msg);
-	}
-	#print "self parent: $self_parent ppid: $ppid\n";
-	if ($self_parent){
-		$shell_parent = get_shell_parent($self_parent);
-		$client{'su-start'} = $shell_parent if ($shell_parent eq 'su' && !$client{'su-start'});
-		#print "shell parent 1: $shell_parent\n";
+		$msg = ($ppid) ? "pppid: $pppid ppid: $ppid": "ppid: undefined";
+		main::log_data('data',$msg);
+	}
+	# print "self parent: $pppid ppid: $ppid\n";
+	if ($pppid){
+		$shell_parent = $client{'parent'};
+		# print "shell parent 1: $shell_parent\n";
 		if ($b_log){
 			$msg = ($shell_parent) ? "shell parent 1: $shell_parent": "shell parent 1: undefined";
-			log_data('data',$msg);
+			main::log_data('data',$msg);
 		}
 		# in case sudo starts inxi, parent is shell (or perl inxi if run by debugger)
 		# so: perl (2) started pinxi with sudo (3) in sh (4) in terminal
-		my $shells = 'ash|bash|busybox|cicada|csh|dash|elvish|fish|fizsh|ksh|ksh93|';
-		$shells .= 'lksh|loksh|mksh|nash|oh|oil|osh|pdksh|perl|posh|';
+		my $shells = 'ash|bash|busybox|cicada|csh|dash|doas|elvish|fish|fizsh|ksh|ksh93|';
+		$shells .= 'lksh|login|loksh|mksh|nash|oh|oil|osh|pdksh|perl|posh|';
 		$shells .= 'su|sudo|tcsh|xonsh|yash|zsh';
-		$shells .= test_shell('return');
-		for my $i (2..4){
-			if ( $shell_parent && $shell_parent =~ /^($shells)$/ ){
-				# no idea why have to do script_parent action twice in su case, but you do.
-				$self_parent = get_start_parent($self_parent);
-				$shell_parent = get_shell_parent($self_parent);
-				#print "self::shell parent 2-${i}: $self_parent :: $shell_parent\n";
-				if ($b_log){
-					$msg = ($shell_parent) ? "shell parent $i: $shell_parent": "shell parent $i: undefined";
-					log_data('data',$msg);
-				}
-			}
-			else {
-				last;
+		$shells .= shell_test('return');
+		my $i = 0;
+		print "self::pppid-0: $pppid :: $shell_parent\n" if $b_debug;
+		# note that new shells not matched will keep this loop spinning until it ends. 
+		# All we really can do about that is update with new shell name when we find them. 
+		while ($i < 8 && $shell_parent && $shell_parent =~ /^($shells)$/){
+			# bash > su > parent
+			$i++;
+			$pppid = get_pppid($pppid);
+			$shell_parent = parent_name($pppid);
+			print "self::pppid-${i}: $pppid :: $shell_parent\n" if $b_debug;
+			if ($b_log){
+				$msg = ($shell_parent) ? "parent-$i: $shell_parent": "shell parent $i: undefined";
+				main::log_data('data',$msg);
 			}
 		}
-		# to work around a ps -p or gnome-terminal bug, which returns 
-		# gnome-terminal- trim - off end 
-		$shell_parent =~ s/-$// if $shell_parent;
 	}
 	if ($b_log){
-		$self_parent ||= '';
+		$pppid ||= '';
 		$shell_parent ||= '';
-		log_data('data',"parents: self: $self_parent shell: $shell_parent");
+		main::log_data('data',"parents: pppid: $pppid parent-name: $shell_parent");
 	}
 	eval $end if $b_log;
 	return $shell_parent;
 }
-
-# utilities for get_shell_source 
-# arg: 1 - parent id
-sub get_start_parent {
+# arg: 1 - parent id 
+# returns SID/start ID
+sub get_pppid {
 	eval $start if $b_log;
-	my ($parent) = @_;
-	return 0 if !$parent;
-	# ps -j -fp : bsds ps do not have -f for PPID, so we can't get the ppid
-	my $cmd = "ps -j -fp $parent 2>/dev/null";
-	log_data('cmd',$cmd) if $b_log;
-	my @data = grabber($cmd);
-	#shift @data if @data;
-	my $self_parent = awk(\@data,"$parent",3,'\s+');
+	my ($ppid) = @_;
+	return 0 if !$ppid;
+	# ps -j -fp : some bsds ps do not have -f for PPID, so we can't get the ppid
+	my $cmd = "ps -wwjfp $ppid 2>/dev/null";
+	main::log_data('cmd',$cmd) if $b_log;
+	my @data = main::grabber($cmd);
+	# shift @data if @data;
+	my $pppid = main::awk(\@data,"$ppid",3,'\s+');
 	eval $end if $b_log;
-	return $self_parent;
+	return $pppid;
 }
-
 # arg: 1 - parent id
-sub get_shell_parent {
+# returns parent command name
+sub parent_name {
 	eval $start if $b_log;
-	my ($parent) = @_;
-	return '' if !$parent;
-	my $cmd = "ps -j -p $parent 2>/dev/null";
-	log_data('cmd',$cmd) if $b_log;
-	my @data = grabber($cmd,'','strip');
-	#shift @data if @data;
-	my $shell_parent = awk(\@data, "$parent",-1,'\s+');
+	my ($ppid) = @_;
+	return '' if !$ppid;
+	my ($parent_name);
+	my $cmd = "ps -wwjp $ppid 2>/dev/null";
+	main::log_data('cmd',$cmd) if $b_log;
+	my @data = main::grabber($cmd,'','strip');
+	# dump the headers if they exist
+	$parent_name = (grep {/$ppid/} @data)[0] if @data;
+	if ($parent_name){
+		# we don't want to worry about column position, just slice off all 
+		# the first part before the command
+		$parent_name =~ s/^.*[0-9]+:[0-9\.]+\s+//;
+		# then get the command
+		$parent_name = (split(/\s+/,$parent_name))[0];
+		# get rid of /../ path info if present
+		$parent_name =~ s|^.*/|| if $parent_name; 
+		# to work around a ps -p or gnome-terminal bug, which returns 
+		# gnome-terminal- trim -/_ off start/end; _su, etc, which breaks detections
+		$parent_name =~ s/^[_-]|[_-]$//g;
+	}
 	eval $end if $b_log;
-	return $shell_parent;
+	return $parent_name;
+}
+# list of program_values non-handled shells, or known to have no version
+# Move shell to set_program_values for print name, or version if available
+# $1 - return|[shell name to test
+# returns test list OR shell name/''
+sub shell_test {
+	my ($test) = @_;
+	# these shells are not verified or tested
+	my $shells = 'apush|ccsh|ch|esh?|eshell|heirloom|hush|';
+	$shells .= 'ion|imrsh|larryshell|mrsh|msh(ell)?|murex|nsh|nu(shell)?|';
+	$shells .= 'oksh|psh|pwsh|pysh(ell)?|rush|sash|xsh?|';
+	# these shells are tested and have no version info
+	$shells .= 'es|rc|scsh|sh';
+	return '|' . $shells if $test eq 'return';
+	return ($test =~ /^($shells)$/) ? $test : '';
 }
-
 # this will test against default IP like: (:0) vs full IP to determine 
 # ssh status. Surprisingly easy test? Cross platform
-sub get_ssh_status {
+sub ssh_status {
 	eval $start if $b_log;
 	my ($b_ssh,$ssh);
 	# fred   pts/10       2018-03-24 16:20 (:0.0)
 	# fred-remote pts/1        2018-03-27 17:13 (43.43.43.43)
-	if (my $program = check_program('who')){
-		$ssh = (grabber("$program am i 2>/dev/null"))[0];
+	if (my $program = main::check_program('who')){
+		$ssh = (main::grabber("$program am i 2>/dev/null"))[0];
 		# crude IP validation
 		if ($ssh && $ssh =~ /\(([:0-9a-f]{8,}|[1-9][\.0-9]{6,})\)$/){
 			$b_ssh = 1;
@@ -21575,1219 +25561,218 @@ sub get_ssh_status {
 	eval $end if $b_log;
 	return $b_ssh;
 }
-
-sub get_tty_console_irc {
+# If IRC: called if root for -S, -G, or if not in display for user.
+sub console_irc_tty {
 	eval $start if $b_log;
-	my ($type) = @_;
-	return $tty_session if defined $tty_session;
-	if ( $type eq 'vtrn' && defined $ENV{'XDG_VTNR'} ){
-		$tty_session = $ENV{'XDG_VTNR'};
+	$loaded{'con-irc-tty'} = 1;
+	# not set for root in or out of display
+	if (defined $ENV{'XDG_VTNR'}){
+		$client{'con-irc-tty'} = $ENV{'XDG_VTNR'};
 	}
 	else {
-		my $ppid = getppid();
-		$tty_session = awk(\@ps_aux,".*$ppid.*$client{'name'}",7,'\s+');
-		$tty_session =~ s/^[^[0-9]+// if $tty_session;
+		# ppid won't work with name, so this is assuming there's only one client running
+		# if in display, -G returns vt size, not screen dimensions in rowsxcols.
+		$client{'con-irc-tty'} = main::awk(\@ps_aux,'.*\b' . $client{'name'} . '\b.*',7,'\s+');
+		$client{'con-irc-tty'} =~ s/^(tty|\?)// if defined $client{'con-irc-tty'};
 	}
-	$tty_session = '' if ! defined $tty_session;
-	log_data('data',"conole-irc-tty:$tty_session") if $b_log;
+	$client{'con-irc-tty'} = '' if !defined $client{'con-irc-tty'};
+	main::log_data('data',"console-irc-tty:$client{'con-irc-tty'}") if $b_log;
 	eval $end if $b_log;
-	return $tty_session;
 }
-
-sub get_tty_number {
+sub tty_number {
 	eval $start if $b_log;
-	my ($tty);
-	if ( defined $ENV{'XDG_VTNR'} ){
-		$tty = $ENV{'XDG_VTNR'};
-	}
-	else {
-		$tty = POSIX::ttyname(1);
-		#variants: /dev/pts/1 /dev/tty1 /dev/ttyp2 /dev/ttyra [hex number a]
-		$tty =~ s/.*\/[^0-9]*//g if defined $tty;
-	}
-	$tty = '' if ! defined $tty;
-	log_data('data',"tty:$tty") if $b_log;
-	eval $end if $b_log;
-	return $tty;
-}
-
-# 2:58PM  up 437 days,  8:18, 3 users, load averages: 2.03, 1.72, 1.77
-# 04:29:08 up  3:18,  3 users,  load average: 0,00, 0,00, 0,00
-# 10:23PM  up 5 days, 16:17, 1 user, load averages: 0.85, 0.90, 1.00
-# 05:36:47 up 1 day,  3:28,  4 users,  load average: 1,88, 0,98, 0,62
-# 05:36:47 up 1 day,  3 min,  4 users,  load average: 1,88, 0,98, 0,62
-# 04:41:23 up  2:16,  load average: 7.13, 6.06, 3.41 # root openwrt
-sub get_uptime {
-	eval $start if $b_log;
-	my ($days,$hours,$minutes,$uptime) = ('','','','');
-	if (check_program('uptime')){
-		$uptime = qx(uptime);
-		$uptime = trimmer($uptime);
-		#$uptime = '05:36:47 up 3 min,  4 users,  load average: 1,88, 0,98, 0,62';
-		if ($uptime && 
-		 $uptime =~ /[\S]+\s+up\s+(([0-9]+)\s+day[s]?,\s+)?(([0-9]{1,2}):([0-9]{1,2})|([0-9]+)\smin[s]?),\s+([0-9]+\s+user|load average)/){
-			$days = $2 . 'd' if $2;
-			$days .= ' ' if ($days && ($4 || $6));
-			if ($4 && $5){
-				$hours = $4 . 'h ';
-				$minutes = $5 . 'm';
-			}
-			elsif ($6){
-				$minutes = $6 . 'm';
-				
-			}
-			$uptime = $days . $hours . $minutes;
+	$loaded{'tty-number'} = 1;
+	# note: ttyname returns undefined if pinxi is > redirected output
+	# variants: /dev/pts/1 /dev/tty1 /dev/ttyp2 /dev/ttyra [hex number a]
+	$client{'tty-number'} = POSIX::ttyname(1);
+	# but tty direct works fine in that case
+	if (!defined $client{'tty-number'} && (my $program = main::check_program('tty'))){
+		chomp($client{'tty-number'} = qx($program 2>/dev/null));
+		if (defined $client{'tty-number'} && $client{'tty-number'} =~ /^not/){
+			undef $client{'tty-number'};
 		}
 	}
-	$uptime ||= 'N/A';
-	eval $end if $b_log;
-	return $uptime;
-}
-#  note: seen instance in android where reading file hangs endlessly!!!
-sub get_wakeups {
-	eval $start if $b_log;
-	return if $b_arm || $b_mips || $b_ppc;
-	my ($wakeups);
-	my $path = '/sys/power/wakeup_count';
-	$wakeups = reader($path,'strip',0) if -r $path;
-	eval $end if $b_log;
-	return $wakeups;
-}
-
-#### -------------------------------------------------------------------
-#### SET DATA VALUES
-#### -------------------------------------------------------------------
-
-# android only, for distro / OS id and machine data
-sub set_build_prop {
-	eval $start if $b_log;
-	my $path = '/system/build.prop';
-	$b_build_prop = 1;
-	return if ! -r $path;
-	my @data = reader($path,'strip');
-	foreach (@data){
-		my @working = split('=', $_);
-		next if $working[0] !~ /^ro\.(build|product)/;
-		if ($working[0] eq 'ro.build.date.utc'){
-			$build_prop{'build-date'} = strftime "%F", gmtime($working[1]);
-		}
-		# ldgacy, replaced by ro.product.device
-		elsif ($working[0] eq 'ro.build.product'){
-			$build_prop{'build-product'} = $working[1];
-		}
-		# this can be brand, company, android, it varies, but we don't want android value
-		elsif ($working[0] eq 'ro.build.user'){
-			$build_prop{'build-user'} = $working[1] if $working[1] !~ /android/i;
-		}
-		elsif ($working[0] eq 'ro.build.version.release'){
-			$build_prop{'build-version'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.board'){
-			$build_prop{'product-board'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.brand'){
-			$build_prop{'product-brand'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.device'){
-			$build_prop{'product-device'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.manufacturer'){
-			$build_prop{'product-manufacturer'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.model'){
-			$build_prop{'product-model'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.name'){
-			$build_prop{'product-name'} = $working[1];
-		}
-		elsif ($working[0] eq 'ro.product.screensize'){
-			$build_prop{'product-screensize'} = $working[1];
-		}
-	}
-	log_data('dump','%build_prop',\%build_prop) if $b_log;
-	print Dumper \%build_prop if $test[20];
-	eval $end if $b_log;
-}
-
-## creates arrays: @devices_audio; @devices_graphics; @devices_hwraid; 
-## @devices_network; @devices_timer plus @devices for logging/debugging
-# 0 type
-# 1 type_id
-# 2 bus_id
-# 3 sub_id
-# 4 device
-# 5 vendor_id
-# 6 chip_id
-# 7 rev
-# 8 port
-# 9 driver
-# 10 modules
-# 11 driver_nu [bsd, like: em0 - driver em; nu 0. Used to match IF in -n
-# 12 subsystem/vendor
-# 13 subsystem vendor_id:chip id
-# 14 soc handle
-## DeviceData / PCI / SOC
-{
-package DeviceData;
-my (@data,@devices,@files,@full_names,@pcis,@temp,@temp2,@temp3);
-
-my ($busid,$busid_nu,$chip_id,$content,$device,$driver,$driver_nu,$file,
-$handle,$modules,$port,$rev,$temp,$type,$type_id,$vendor,$vendor_id);
-
-sub set {
-	eval $start if $b_log;
-	$_[0] = 1; # check boolean passed by reference
-	if ( $b_pci ){
-		if (!$bsd_type){
-			if ($alerts{'lspci'}->{'action'} eq 'use' ){
-				lspci_data();
-			}
-			# ! -d '/proc/bus/pci'
-			# this is sketchy, a sbc won't have pci, but a non sbc arm may have it, so 
-			# build up both and see what happens
-			if ($b_arm || $b_mips || $b_ppc || $b_sparc){
-				soc_data();
-			}
-		}
-		else {
-			#if (1 == 1){
-			if ($alerts{'pciconf'}->{'action'} eq 'use'){
-				pciconf_data();
-			}
-			elsif ($alerts{'pcidump'}->{'action'} eq 'use'){
-				pcidump_data();
-			}
-		}
-		if ($test[9]){
-			print Data::Dumper::Dumper \@devices_audio;
-			print Data::Dumper::Dumper \@devices_graphics;
-			print Data::Dumper::Dumper \@devices_network;
-			print Data::Dumper::Dumper \@devices_hwraid;
-			print Data::Dumper::Dumper \@devices_timer;
-			print "vm: $device_vm\n";
-		}
-		if ( $b_log){
-			main::log_data('dump','@devices_audio',\@devices_audio);
-			main::log_data('dump','@devices_graphics',\@devices_graphics);
-			main::log_data('dump','@devices_hwraid',\@devices_hwraid);
-			main::log_data('dump','@devices_network',\@devices_network);
-			main::log_data('dump','@devices_timer',\@devices_timer);
-		}
-	}
-	@devices = undef;
-	eval $end if $b_log;
-}
-
-sub lspci_data {
-	eval $start if $b_log;
-	my ($subsystem,$subsystem_id);
-	@data = pci_grabber('lspci');
-	#print Data::Dumper::Dumper \@data;
-	foreach (@data){
-		#print "$_\n";
-		if ($device){
-			if ($_ =~ /^~$/) {
-				@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
-				$rev,$port,$driver,$modules,$driver_nu,$subsystem,$subsystem_id);
-				assign_data('pci',\@temp);
-				$device = '';
-				#print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
-			}
-			elsif ($_ =~ /^Subsystem.*\[([a-f0-9]{4}:[a-f0-9]{4})\]/){
-				$subsystem_id = $1;
-				$subsystem = (split(/^Subsystem:\s*/, $_))[1];
-				$subsystem =~ s/(\s?\[[^\]]+\])+$//g;
-				$subsystem = main::cleaner($subsystem);
-				$subsystem = main::pci_cleaner($subsystem,'pci');
-				$subsystem = main::pci_cleaner_subsystem($subsystem);
-				#print "ss:$subsystem\n";
-			}
-			elsif ($_ =~ /^I\/O\sports/){
-				$port = (split(/\s+/, $_))[3];
-				#print "p:$port\n";
-			}
-			elsif ($_ =~ /^Kernel\sdriver\sin\suse/){
-				$driver = (split(/:\s*/, $_))[1];
-			}
-			elsif ($_ =~ /^Kernel\smodules/i){
-				$modules = (split(/:\s*/, $_))[1];
-			}
-		}
-		# note: arm servers can have more complicated patterns
-		# 0002:01:02.0 Ethernet controller [0200]: Cavium, Inc. THUNDERX Network Interface Controller virtual function [177d:a034] (rev 08)
-		elsif ($_ =~ /^(([0-9a-f]{2,4}:)?[0-9a-f]{2}:[0-9a-f]{2})[.:]([0-9a-f]+)\s(.*)\s\[([0-9a-f]{4}):([0-9a-f]{4})\](\s\(rev\s([^\)]+)\))?/){
-			$busid = $1;
-			$busid_nu = hex($3);
-			@temp = split(/:\s+/, $4);
-			$device = $temp[1];
-			$type = $temp[0];
-			$vendor_id = $5;
-			$chip_id = $6;
-			$rev = ($8)? $8 : '';
-			$device = main::cleaner($device);
-			$temp[0] =~ /\[([^\]]+)\]$/;
-			$type_id = $1;
-			$b_hardware_raid = 1 if $type_id eq '0104';
-			$type = lc($type);
-			$type = main::pci_cleaner($type,'pci');
-			$type =~ s/\s+$//;
-			#print "$type\n";
-			($driver,$driver_nu,$modules,$subsystem,$subsystem_id) = ('','','','','');
-		}
-	}
-	print Data::Dumper::Dumper \@devices if $test[4];
-	main::log_data('dump','lspci @devices',\@devices) if $b_log;
-	eval $end if $b_log;
-}
-
-# em0@pci0:6:0:0:	class=0x020000 card=0x10d315d9 chip=0x10d38086 rev=0x00 hdr=0x00
-#     vendor     = 'Intel Corporation'
-#     device     = 'Intel 82574L Gigabit Ethernet Controller (82574L)'
-#     class      = network
-#     subclass   = ethernet
-sub pciconf_data {
-	eval $start if $b_log;
-	@data = pci_grabber('pciconf');
-	foreach (@data){
-		if ($driver){
-			if ($_ =~ /^~$/) {
-				$vendor = main::cleaner($vendor);
-				$device = main::cleaner($device);
-				# handle possible regex in device name, like [ConnectX-3] 
-				# and which could make matches fail
-				my $device_temp = main::regex_cleaner($device);
-				if ($vendor && $device){
-					if (main::regex_cleaner($vendor) !~ /\Q$device_temp\E/i){
-						$device = "$vendor $device";
-					}
-				}
-				elsif (!$device){
-					$device = $vendor;
-				}
-				@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
-				$rev,$port,$driver,$modules,$driver_nu);
-				assign_data('pci',\@temp);
-				$driver = '';
-				#print "$busid $device_id r:$rev p: $port\n$type\n$device\n";
-			}
-			elsif ($_ =~ /^vendor/){
-				$vendor = (split(/\s+=\s+/, $_))[1];
-				#print "p:$port\n";
-			}
-			elsif ($_ =~ /^device/){
-				$device = (split(/\s+=\s+/, $_))[1];
-			}
-			elsif ($_ =~ /^class/i){
-				$type = (split(/\s+=\s+/, $_))[1];
-			}
-		}
-		elsif (/^([^@]+)\@pci([0-9]{1,3}:[0-9]{1,3}:[0-9]{1,3}):([0-9]{1,3}).*class=([^\s]+)\scard=([^\s]+)\schip=([^\s]+)\srev=([^\s]+)/){
-			$driver = $1;
-			$busid = $2;
-			$busid_nu = $3;
-			$type_id = $4;
-			#$vendor_id = $5;
-			$vendor_id = substr($6,6,4);
-			$chip_id = substr($6,2,4);
-			$rev = $7;
-			$driver =~ /(^[a-z]+)([0-9]+$)/;
-			$driver = $1;
-			$driver_nu = $2;
-			# convert to 4 character, strip off 0x, and last trailing sub sub class.
-			$type_id =~ s/^(0x)?([0-9a-f]{4}).*/$2/ if $type_id;
-			($device,$type,$vendor) = ('','','');
-		}
-	}
-	print Data::Dumper::Dumper \@devices if $test[4];
-	main::log_data('dump','pciconf @devices',\@devices) if $b_log;
-	eval $end if $b_log;
-}
-
-sub pcidump_data {
-	eval $start if $b_log;
-	@data = pci_grabber('pcidump');
-	foreach (@data){
-		if ($_ =~ /^~$/ && $busid && $device) {
-			@temp = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
-			$rev,$port,$driver,$modules,$driver_nu);
-			assign_data('pci',\@temp);
-			($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,
-			$rev,$port,$driver,$modules,$driver_nu) = undef;
-			next;
-		}
-		if ($_ =~ /^([0-9a-f:]+):([0-9]+):\s([^:]+)$/i){
-			$busid = $1;
-			$busid_nu = $2;
-			$device = main::cleaner($3);
-		}
-		elsif ($_ =~ /^0x[\S]{4}: Vendor ID: ([0-9a-f]{4}) Product ID: ([0-9a-f]{4})/ ){
-			$vendor_id = $1;
-			$chip_id = $2;
-		}
-		elsif ($_ =~ /^0x[\S]{4}: Class: ([0-9a-f]{2}) Subclass: ([0-9a-f]{2}) Interface: ([0-9a-f]+) Revision: ([0-9a-f]+)/){
-			$type = pci_class($1);
-			$type_id = "$1$2";
-		}
-	}
-	print Data::Dumper::Dumper \@devices if $test[4];
-	main::log_data('dump','pcidump @devices',\@devices) if $b_log;
-	eval $end if $b_log;
-}
-sub pci_grabber {
-	eval $start if $b_log;
-	my ($program) = @_;
-	my ($args,$path,$pattern,@working);
-	if ($program eq 'lspci'){
-		$args = ' -knnv';
-		$path = $alerts{'lspci'}->{'path'};
-		$pattern = '^[0-9a-f]+:';
-	}
-	elsif ($program eq 'pciconf'){
-		$args = ' -lv';
-		$path = $alerts{'pciconf'}->{'path'};
-		$pattern = '^([^@]+)\@pci';
-	}
-	elsif ($program eq 'pcidump'){
-		$args = ' -v';
-		$path = $alerts{'pcidump'}->{'path'};
-		$pattern = '^[0-9a-f]+:';
-	}
-	@data = main::grabber("$path $args 2>/dev/null",'','strip');
-	#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pciconf/pci-freebsd-8.2-2";
-	#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/pcidump/pci-openbsd-6.1-vm.txt";
-	#my $file = "$ENV{HOME}/bin/scripts/inxi/data/lspci/racermach-1-knnv.txt";
-	#my $file = "$ENV{HOME}/bin/scripts/inxi/data/lspci/rk016013-knnv.txt";
-	#@data = main::reader($file,'strip');
-	if (@data){
-		$b_pci_tool = 1 if scalar @data > 10;
-		foreach (@data){
-			if ($_ =~ /$pattern/i){
-				push(@working, '~');
-			}
-			push(@working, $_);
-		}
-		push(@working, '~');
-	}
-	#print Data::Dumper::Dumper \@working;
-	eval $end if $b_log;
-	return @working;
-}
-
-sub soc_data {
-	eval $start if $b_log;
-	soc_devices_files();
-	soc_devices();
-	soc_devicetree();
-	print Data::Dumper::Dumper \@devices if $test[4];
-	main::log_data('dump','soc @devices',\@devices) if $b_log;
-	eval $end if $b_log;
-}
-# 1: /sys/devices/platform/soc/1c30000.ethernet/uevent:["DRIVER=dwmac-sun8i", "OF_NAME=ethernet", 
-# "OF_FULLNAME=/soc/ethernet@1c30000", "OF_COMPATIBLE_0=allwinner,sun8i-h3-emac", 
-# "OF_COMPATIBLE_N=1", "OF_ALIAS_0=ethernet0", # "MODALIAS=of:NethernetT<NULL>Callwinner,sun8i-h3-emac"]
-# 2: /sys/devices/platform/soc:audio/uevent:["DRIVER=bcm2835_audio", "OF_NAME=audio", "OF_FULLNAME=/soc/audio", 
-# "OF_COMPATIBLE_0=brcm,bcm2835-audio", "OF_COMPATIBLE_N=1", "MODALIAS=of:NaudioT<NULL>Cbrcm,bcm2835-audio"]
-# 3: /sys/devices/platform/soc:fb/uevent:["DRIVER=bcm2708_fb", "OF_NAME=fb", "OF_FULLNAME=/soc/fb", 
-# "OF_COMPATIBLE_0=brcm,bcm2708-fb", "OF_COMPATIBLE_N=1", "MODALIAS=of:NfbT<NULL>Cbrcm,bcm2708-fb"]
-# 4: /sys/devices/platform/soc/1c40000.gpu/uevent:["OF_NAME=gpu", "OF_FULLNAME=/soc/gpu@1c40000", 
-# "OF_COMPATIBLE_0=allwinner,sun8i-h3-mali", "OF_COMPATIBLE_1=allwinner,sun7i-a20-mali", 
-# "OF_COMPATIBLE_2=arm,mali-400", "OF_COMPATIBLE_N=3", 
-# "MODALIAS=of:NgpuT<NULL>Callwinner,sun8i-h3-maliCallwinner,sun7i-a20-maliCarm,mali-400"]
-# 5: /sys/devices/platform/soc/soc:internal-regs/d0018180.gpio/uevent
-# 6: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:05/uevent
-#  ["DRIVER=AR8035", "OF_NAME=ethernet-phy"
-# 7: /sys/devices/soc.0/1c30000.eth/uevent
-# 8: /sys/devices/wlan.26/uevent [from pine64]
-# 9: /sys/devices/platform/audio/uevent:["DRIVER=bcm2835_AUD0", "OF_NAME=audio"
-# 10: /sys/devices/vio/71000002/uevent:["DRIVER=ibmveth", "OF_NAME=l-lan"
-# 11: /sys/devices/platform/soc:/soc:i2c-hdmi:/i2c-2/2-0050/uevent:['OF_NAME=hdmiddc'
-# 12: /sys/devices/platform/soc:/soc:i2c-hdmi:/uevent:['DRIVER=i2c-gpio', 'OF_NAME=i2c-hdmi'
-sub soc_devices_files {
-	eval $start if $b_log;
-	if (-d '/sys/devices/platform/'){
-		@files = main::globber('/sys/devices/platform/soc*/*/uevent');
-		@temp2 = main::globber('/sys/devices/platform/soc*/*/*/uevent');
-		push(@files,@temp2) if @temp2;
-		@temp2 = main::globber('/sys/devices/platform/*/uevent');
-		push(@files,@temp2) if @temp2;
-	}
-	if (main::globber('/sys/devices/soc*')){
-		@temp2 = main::globber('/sys/devices/soc*/*/uevent');
-		push(@files,@temp2) if @temp2;
-		@temp2 = main::globber('/sys/devices/soc*/*/*/uevent');
-		push(@files,@temp2) if @temp2;
-	}
-	@temp2 = main::globber('/sys/devices/*/uevent'); # see case 8
-	push(@files,@temp2) if @temp2;
-	@temp2 = main::globber('/sys/devices/*/*/uevent'); # see case 10
-	push(@files,@temp2) if @temp2;
-	@temp2 = undef;
-	# not sure why, but even as root/sudo, /subsystem|driver/uevent are unreadable with -r test true
-	@files = grep {!/\/(subsystem|driver)\//} @files if @files;
-	main::uniq(\@files);
-	eval $end if $b_log;
-}
-sub soc_devices {
-	eval $start if $b_log;
-	my (@working);
-	foreach $file (@files){
-		next if -z $file;
-		$chip_id = $file;
-		# variants: /soc/20100000.ethernet/ /soc/soc:audio/ /soc:/ /soc@0/ /soc:/12cb0000.i2c:/
-		# mips: /sys/devices/soc.0/1180000001800.mdio/8001180000001800:07/
-		# ppc: /sys/devices/vio/71000002/
-		$chip_id =~ /\/sys\/devices\/(platform\/)?(soc[^\/]*\/)?([^\/]+\/)?([^\/]+\/)?([^\/\.:]+)([\.:])?([^\/:]+)?:?\/uevent$/;
-		$chip_id = $5;
-		$temp = $7;
-		@working = main::reader($file, 'strip') if -r $file;
-		($device,$driver,$handle,$type,$vendor_id) = (undef,undef,undef,undef,undef);
-		foreach my $data (@working){
-			@temp2 = split('=', $data);
-			if ($temp2[0] eq 'DRIVER'){
-				$driver = $temp2[1];
-				$driver =~ s/-/_/g if $driver; # kernel uses _, not - in module names
-			}
-			elsif ($temp2[0] eq 'OF_NAME'){
-				$type = $temp2[1];
-			}
-			# we'll use these paths to test in device tree pci completer
-			elsif ($temp2[0] eq 'OF_FULLNAME' && $temp2[1]){
-				# we don't want the short names like /soc, /led and so on
-				push(@full_names, $temp2[1]) if (() = $temp2[1] =~ /\//g) > 1;
-				$handle = (split('@', $temp2[1]))[-1] if $temp2[1] =~ /@/;
-			}
-			elsif ($temp2[0] eq 'OF_COMPATIBLE_0'){
-				@temp3 = split(',', $temp2[1]);
-				$device = $temp3[-1];
-				$vendor_id = $temp3[0];
-			}
-		}
-		# it's worthless, we can't use it
-		next if ! defined $type;
-		$type_id = $type;
-		$chip_id = '' if ! defined $chip_id;
-		$vendor_id = '' if ! defined $vendor_id;
-		$driver = '' if ! defined $driver;
-		$handle = '' if ! defined $handle;
-		$busid = (defined $temp && main::is_int($temp)) ? $temp: 0;
-		$type = soc_type($type,$vendor_id,$driver);
-		($busid_nu,$modules,$port,$rev) = (0,'','','');
-		@temp3 = ($type,$type_id,$busid,$busid_nu,$device,$vendor_id,$chip_id,$rev,
-		$port,$driver,$modules,'','','',$handle);
-		assign_data('soc',\@temp3);
-	}
-	eval $end if $b_log;
-}
-sub soc_devicetree {
-	eval $start if $b_log;
-	# now we want to fill in stuff that was not in /sys/devices/ 
-	if (-d '/sys/firmware/devicetree/base/soc'){
-		@files = main::globber('/sys/firmware/devicetree/base/soc/*/compatible');
-		my $test = (@full_names) ? join('|', sort @full_names) : 'xxxxxx';
-		foreach $file (@files){
-			if ( $file !~ m%$test%){
-				($handle,$content,$device,$type,$type_id,$vendor_id) = ('','','','','','');
-				$content = main::reader($file, 'strip',0) if -r $file;
-				$file =~ m%soc/([^@]+)@([^/]+)/compatible$%;
-				$type = $1;
-				next if !$type || !$content;
-				$handle = $2 if $2;
-				$type_id = $type;
-				if ($content){
-					@temp3 = split(',', $content);
-					$vendor_id = $temp3[0];
-					$device = $temp3[-1];
-					# strip off those weird device tree special characters
-					$device =~ s/\x01|\x02|\x03|\x00//g;
-				}
-				$type = soc_type($type,$vendor_id,'');
-				@temp3 = ($type,$type_id,0,0,$device,$vendor_id,'soc','','','','','','','',$handle);
-				assign_data('soc',\@temp3);
-				main::log_data('dump','@devices @temp3',\@temp3) if $b_log;
-			}
-		}
-	}
-	eval $end if $b_log;
-}
-sub assign_data {
-	my ($tool,$data) = @_;
-	if (check_graphics($data->[0],$data->[1])){
-		push(@devices_graphics,[@$data]);
-		$b_soc_gfx = 1 if $tool eq 'soc';
-	}
-	# for hdmi, we need gfx/audio both
-	if (check_audio($data->[0],$data->[1])){
-		push(@devices_audio,[@$data]);
-		$b_soc_audio = 1 if $tool eq 'soc';
-	}
-	if (check_bluetooth($data->[0],$data->[1])){
-		push(@devices_bluetooth,[@$data]);
-		$b_soc_bluetooth = 1 if $tool eq 'soc';
-	}
-	elsif (check_hwraid($data->[0],$data->[1])){
-		push(@devices_hwraid,[@$data]);
-		$b_soc_net = 1 if $tool eq 'soc';
-	}
-	elsif (check_network($data->[0],$data->[1])){
-		push(@devices_network,[@$data]);
-		$b_soc_net = 1 if $tool eq 'soc';
-	}
-	elsif (check_timer($data->[0],$data->[1])){
-		push(@devices_timer,[@$data]);
-		$b_soc_timer = 1;
-	}
-	# not used at this point, -M comes before ANG
-	# $device_vm = check_vm($data[4]) if ( (!$b_ppc && !$b_mips) && !$device_vm );
-	push(@devices,[@$data]);
-}
-# note: for soc, these have been converted in soc_type()
-sub check_audio {
-	if ( ( $_[1] && length($_[1]) == 4 && $_[1] =~ /^04/ ) ||
-		( $_[0] && $_[0] =~ /^(audio|hdmi|multimedia|sound)$/i )){
-		return 1;
-	}
-	else {return 0}
-}
-sub check_bluetooth {
-	if ( ( $_[1] && length($_[1]) == 4 && $_[1] eq '0d11' ) ||
-		( $_[0] && $_[0] =~ /^(bluetooth)$/i )){
-		return 1;
-	}
-	else {return 0}
-}
-sub check_graphics {
-	# note: multimedia class 04 is viddeo if 0400. 'tv' is risky I think
-	if ( ( $_[1] && length($_[1]) == 4 &&  ($_[1] =~ /^03/ || $_[1] eq '0400' || 
-	 $_[1] eq '0d80' ) ) || 
-	 ( $_[0] && $_[0] =~ /^(vga|display|hdmi|3d|video|tv|television)$/i)){
-		return 1;
-	}
-	else {return 0}
-}
-sub check_hwraid {
-	return 1 if ( $_[1] && $_[1] eq '0104' );
-}
-# NOTE: class 06 subclass 80 
-# https://www-s.acm.illinois.edu/sigops/2007/roll_your_own/7.c.1.html
-# 0d20: 802.11a 0d21: 802.11b 0d80: other wireless
-sub check_network {
-	if ( ( $_[1] && length($_[1]) == 4 && ($_[1] =~/^02/ || $_[1] =~ /^0d2/ || $_[1] eq '0680' ) ) ||
-		( $_[0] && $_[0] =~  /^(ethernet|network|wifi|wlan)$/i ) ){
-		return 1;
-	}
-	else {return 0}
-}
-sub check_timer {
-	return 1 if ( $_[0] && $_[0] eq 'timer' );
-}
-sub check_vm {
-	if ( $_[0] && $_[0] =~ /(innotek|vbox|virtualbox|vmware|qemu)/i ) {
-		return $1
-	}
-	else {return ''}
-}
-
-sub soc_type {
-	my ($type,$info,$driver) = @_;
-	# I2S or i2s. I2C is i2 controller |[iI]2[Ss]. note: odroid hdmi item is sound only
-	# snd_soc_dummy. simple-audio-amplifier driver: speaker_amp
-	if (($driver && $driver =~ /codec/) || ($info && $info =~ /codec/) ||
-	 ($type && $type =~ /codec/) ){
-		$type = 'codec';
-	}
-	elsif (($driver && $driver =~ /dummy/i) || ($info && $info =~ /dummy/i)){
-		$type = 'dummy';
-	}
-	elsif ($type =~ /^(daudio|.*hifi.*|.*sound[_-]card|.*dac[0-9]?)$/i ||
-	 ($info && $info !~ /amp/i && $info =~ /(sound|audio)/i) || 
-	 ($driver && $driver =~ /(audio|snd|sound)/i) ){
-		$type = 'audio';
-	}
-	elsif ($type =~ /^((meson-?)?fb|disp|display(-[^\s]+)?|gpu|.*mali|vpu)$/i){
-		$type = 'display';
-	}
-	# includes ethernet-phy, meson-eth
-	elsif ($type =~ /^(([^\s]+-)?eth|ethernet(-[^\s]+)?|lan|l-lan)$/i){
-		$type = 'ethernet';
-	}
-	elsif ($type =~ /^(.*wlan.*|.*wifi.*)$/i){
-		$type = 'wifi';
-	}
-	# needs to catch variants like hdmi-tx but not hdmi-connector
-	elsif ( $type =~ /^(.*hdmi(-?tx)?)$/i){
-		$type = 'hdmi';
-	}
-	elsif ($type =~ /^timer$/i){
-		$type = 'timer';
-	}
-	return $type;
-}
-sub pci_class {
-	eval $start if $b_log;
-	my ($id) = @_;
-	$id = lc($id);
-	my %classes = (
-	'00' => 'unclassified',
-	'01' => 'mass-storage',
-	'02' => 'network',
-	'03' => 'display',
-	'04' => 'audio',
-	'05' => 'memory',
-	'06' => 'bridge',
-	'07' => 'communication',
-	'08' => 'peripheral',
-	'09' => 'input',
-	'0a' => 'docking',
-	'0b' => 'processor',
-	'0c' => 'serialbus',
-	'0d' => 'wireless',
-	'0e' => 'intelligent',
-	'0f' => 'satellite',
-	'10' => 'encryption',
-	'11' => 'signal-processing',
-	'12' => 'processing-accelerators',
-	'13' => 'non-essential-instrumentation',
-	'40' => 'coprocessor',
-	'ff' => 'unassigned',
-	);
-	my $type = (defined $classes{$id}) ? $classes{$id}: 'unhandled';
-	eval $end if $b_log;
-	return $type;
-}
-}
-
-sub set_dmesg_boot_data {
-	eval $start if $b_log;
-	my ($file,@temp);
-	my ($counter) = (0);
-	$b_dmesg_boot_check = 1;
-	if (!$b_fake_dboot){
-		$file = system_files('dmesg-boot');
-	}
-	else {
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/bsd-disks-diabolus.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-disks-solestar.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/freebsd-enceladus-1.txt";
-		## matches: toshiba: openbsd-5.6-sysctl-2.txt
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-5.6-dmesg.boot-1.txt";
-		## matches: compaq: openbsd-5.6-sysctl-1.txt"
-		$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmesg-boot/openbsd-dmesg.boot-1.txt";
-	}
-	if ($file){
-		return if ! -r $file;
-		@dmesg_boot = reader($file);
-		# some dmesg repeats, so we need to dump the second and > iterations
-		# replace all indented items with ~ so we can id them easily while
-		# processing note that if user, may get error of read permissions
-		# for some weird reason, real mem and avail mem are use a '=' separator, 
-		# who knows why, the others are ':'
-		foreach (@dmesg_boot){
-			$counter++ if /^(OpenBSD|DragonFly|FreeBSD is a registered trademark)/;
-			last if $counter > 1;
-			$_ =~ s/\s*=\s*|:\s*/:/;
-			$_ =~ s/\"//g;
-			$_ =~ s/^\s+/~/;
-			$_ =~ s/\s\s/ /g;
-			$_ =~ s/^(\S+)\sat\s/$1:at /; # ada0 at ahcich0
-			push(@temp, $_);
-			if (/^bios[0-9]:(at|vendor)/){
-				push(@sysctl_machine, $_);
-			}
-		}
-		@dmesg_boot = @temp;
-		# FreeBSD: 'da*' is a USB device 'ada*' is a SATA device 'mmcsd*' is an SD card
-		if ($b_dm_boot_disk && @dmesg_boot){
-			@dm_boot_disk = grep {/^(ad|ada|da|mmcblk|mmcsd|nvme[0-9]+n|sd|wd)[0-9]+(:|\sat\s)/} @dmesg_boot;
-			log_data('dump','@dm_boot_disk',\@dm_boot_disk) if $b_log;
-			print Dumper \@dm_boot_disk if $test[11];
-		}
-		if ($b_dm_boot_optical && @dmesg_boot){
-			@dm_boot_optical = grep {/^(cd)[0-9]+(\([^)]+\))?(:|\sat\s)/} @dmesg_boot;
-			log_data('dump','@dm_boot_optical',\@dm_boot_optical) if $b_log;
-			print Dumper \@dm_boot_optical if $test[11];
-		}
-	}
-	log_data('dump','@dmesg_boot',\@dmesg_boot) if $b_log;
-	#print Dumper \@dmesg_boot if $test[11];
-	eval $end if $b_log;
-}
-
-# note, all actual tests have already been run in check_tools so if we
-# got here, we're good. 
-sub set_dmi_data {
-	eval $start if $b_log;
-	$_[0] = 1; # check boolean passed by reference
-	if ($b_fake_dmidecode || $alerts{'dmidecode'}->{'action'} eq 'use' ){
-		set_dmidecode_data();
-	}
-	eval $end if $b_log;
-}
-
-sub set_dmidecode_data {
-	eval $start if $b_log;
-	my ($content,@data,@working,$type,$handle);
-	if ($b_fake_dmidecode){
-		my $file;
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/pci-freebsd-8.2-2";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-loki-1.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-t41-1.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-mint-20180106.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-vmware-ram-1.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/dmidecode/dmidecode-tyan-4408.txt";
-		#$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ram/dmidecode-speed-configured-1.txt";
-		$file = "$ENV{'HOME'}/bin/scripts/inxi/data/ram/dmidecode-speed-configured-2.txt";
-		open(my $fh, '<', $file) or die "can't open $file: $!";
-		chomp(@data = <$fh>);
+	if (defined $client{'tty-number'}){
+		$client{'tty-number'} =~ s/^\/dev\/(tty)?//;
 	}
 	else {
-		$content = qx($alerts{'dmidecode'}->{'path'} 2>/dev/null);
-		@data = split('\n', $content);
-	}
-	# we don't need the opener lines of dmidecode output
-	# but we do want to preserve the indentation. Empty lines
-	# won't matter, they will be skipped, so no need to handle them.
-	# some dmidecodes do not use empty line separators
-	splice(@data, 0, 5) if @data;
-	my $j = 0;
-	my $b_skip = 1;
-	foreach (@data){
-		if (!/^Hand/){
-			next if $b_skip;
-			if (/^[^\s]/){
-				$_ = lc($_);
-				$_ =~ s/\s(information)//;
-				push(@working, $_);
-			}
-			elsif (/^\t/){
-				$_ =~ s/^\t\t/~/;
-				$_ =~ s/^\t|\s+$//g;
-				push(@working, $_);
-			}
-		}
-		elsif (/^Handle\s(0x[0-9A-Fa-f]+).*DMI\stype\s([0-9]+),.*/){
-			$j = scalar @dmi;
-			$handle = hex($1);
-			$type = $2;
-			$b_slot_tool = 1 if $type && $type == 9;
-			$b_skip = ( $type > 126 )? 1 : 0;
-			next if $b_skip;
-			# we don't need 32, system boot, or 127, end of table
-			if (@working){
-				if ($working[0] != 32 && $working[0] < 127){
-					$dmi[$j] = (
-					[@working],
-					);
-				}
-			}
-			@working = ($type,$handle);
-		}
+		$client{'tty-number'} = '';
 	}
-	if (@working && $working[0] != 32 && $working[0] != 127){
-		$j = scalar @dmi;
-		$dmi[$j] = \@working;
-	}
-	# last by not least, sort it by dmi type, now we don't have to worry
-	# about random dmi type ordering in the data, which happens. Also sort 
-	# by handle, as secondary sort.
-	@dmi = sort { $a->[0] <=> $b->[0] || $a->[1] <=> $b->[1] } @dmi;
-	log_data('dump','@dmi',\@dmi) if $b_log;
-	print Dumper \@dmi if $test[2];
-	eval $end if $b_log;
-}
-
-sub set_ip_data {
-	eval $start if $b_log;
-	if ($alerts{'ip'}->{'action'} eq 'use' ){
-		set_ip_addr();
-	}
-	elsif ($alerts{'ifconfig'}->{'action'} eq 'use'){
-		set_ifconfig();
-	}
-	eval $end if $b_log;
-}
-
-sub set_ip_addr {
-	eval $start if $b_log;
-	my @data = grabber($alerts{'ip'}->{'path'} . " addr 2>/dev/null",'\n','strip');
-	# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/if/scope-ipaddr-1.txt";
-	# my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/networking/ip-addr-blue-advance.txt";
-	#my @data = reader($file,'strip') or die $!;
-	my ($b_skip,$broadcast,$if,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
-	foreach (@data){
-		if (/^[0-9]/){
-			#print "$_\n";
-			if (@ips){
-			#print "$if\n";
-				@temp = ($if,[@ips]);
-				push(@ifs,@temp);
-				@ips = ();
-			}
-			@temp = split(/:\s+/, $_);
-			$if = $temp[1];
-			if ($if eq 'lo'){
-				$b_skip = 1;
-				$if = '';
-				next;
-			}
-			$b_skip = 0;
-			@temp = ();
-		}
-		elsif (!$b_skip && /^inet/){
-			#print "$_\n";
-			@temp = split(/\s+/, $_);
-			($broadcast,$ip,$scope,$if_id,$type) = ('','','','','');
-			$ip = $temp[1];
-			$type = ($temp[0] eq 'inet') ? 4 : 6 ;
-			if ($temp[2] eq 'brd'){
-				$broadcast = $temp[3];
-			}
-			if (/scope\s([^\s]+)(\s(.+))?/){
-				$scope = $1;
-				$if_id = $3;
-			}
-			@temp = ($type,$ip,$broadcast,$scope,$if_id);
-			push(@ips,[@temp]);
-			#print Dumper \@ips;
-		}
-	}
-	#print Dumper \@ips if $test[4];
-	if (@ips){
-		@temp = ($if,[@ips]);
-		push(@ifs,@temp);
-	}
-	log_data('dump','@ifs',\@ifs) if $b_log;
-	print Dumper \@ifs if $test[3];
-	eval $end if $b_log;
-}
-
-sub set_ifconfig {
-	eval $start if $b_log;
-	my @data = grabber($alerts{'ifconfig'}->{'path'} . " 2>/dev/null",'\n','');
-	#my @data = reader("$ENV{'HOME'}/bin/scripts/inxi/data/if/vps-ifconfig-1.txt",'') or die $!;
-	my ($b_skip,$broadcast,$if,@ips_bsd,$ip,@ips,$scope,$if_id,$type,@temp,@temp2);
-	my ($state,$speed,$duplex,$mac);
-	foreach (@data){
-		if (/^[\S]/i){
-			#print "$_\n";
-			if (@ips){
-			#print "here\n";
-				@temp = ($if,[@ips]);
-				push(@ifs,@temp);
-				@ips = ();
-			}
-			if ($mac){
-				@temp = ($if,[($state,$speed,$duplex,$mac)]);
-				push(@ifs_bsd,@temp);
-				($state,$speed,$duplex,$mac,$if_id) = ('','','','','');
-			}
-			$if = (split(/\s+/, $_))[0];
-			$if =~ s/:$//; # em0: flags=8843
-			$if_id = $if;
-			$if = (split(':', $if))[0] if $if;
-			if ($if =~ /^lo/){
-				$b_skip = 1;
-				$if = '';
-				$if_id = '';
-				next;
-			}
-			$b_skip = 0;
-		}
-		# lladdr openbsd
-		elsif (!$b_skip && $bsd_type && /^\s+(ether|media|status|lladdr)/){
-			$_ =~ s/^\s+//;
-			# media: Ethernet 100baseTX <full-duplex> freebsd 7.3 
-			# media: Ethernet autoselect (1000baseT <full-duplex>) Freebsd 8.2
-			# 
-			if (/^media/){
-				# openbsd: media: Ethernet autoselect (1000baseT full-duplex)
-				if ($bsd_type && $bsd_type eq 'openbsd'){
-					$_ =~ /\s\([\S]+\s([\S]+)\)/;
-					$duplex = $1;
-				}
-				else {
-					$_ =~ /<([^>]+)>/;
-					$duplex = $1;
-				}
-				$_ =~ /\s\(([1-9][\S]+\s)/;
-				$speed = $1;
-				$speed =~ s/\s+$// if $speed;
-			}
-			elsif (!$mac && /^ether|lladdr/){
-				$mac = (split(/\s+/, $_))[1];
-			}
-			elsif (/^status/){
-				$state = (split(/\s+/, $_))[1];
-			}
-		}
-		elsif (!$b_skip && /^\s+inet/){
-			#print "$_\n";
-			$_ =~ s/^\s+//;
-			$_ =~ s/addr:\s/addr:/;
-			@temp = split(/\s+/, $_);
-			($broadcast,$ip,$scope,$type) = ('','','','');
-			$ip = $temp[1];
-			# fe80::225:90ff:fe13:77ce%em0
-# 			$ip =~ s/^addr:|%([\S]+)//;
-			if ($1 && $1 ne $if_id){
-				$if_id = $1;
-			}
-			$type = ($temp[0] eq 'inet') ? 4 : 6 ;
-			if (/(Bcast:|broadcast\s)([\S]+)/){
-				$broadcast = $2;
-			}
-			if (/(scopeid\s[^<]+<|Scope:|scopeid\s)([^>]+)[>]?/){
-				$scope = $2;
-			}
-			$scope = 'link' if $ip =~ /^fe80/;
-			@temp = ($type,$ip,$broadcast,$scope,$if_id);
-			push(@ips,[@temp]);
-			#print Dumper \@ips;
-		}
-	}
-	if (@ips){
-		@temp = ($if,[@ips]);
-		push(@ifs,@temp);
+	# systemd only item, usually same as tty in console, not defined
+	# for root or non systemd systems.
+	if (defined $ENV{'XDG_VTNR'} && $client{'tty-number'} ne '' && 
+	 $ENV{'XDG_VTNR'} ne $client{'tty-number'}){
+		$client{'tty-number'} = "$client{'tty-number'} (vt $ENV{'XDG_VTNR'})";
 	}
-	if ($mac){
-		@temp = ($if,[($state,$speed,$duplex,$mac)]);
-		push(@ifs_bsd,@temp);
-		($state,$speed,$duplex,$mac) = ('','','','');
+	elsif ($client{'tty-number'} eq '' && defined $ENV{'XDG_VTNR'}){
+		$client{'tty-number'} = $ENV{'XDG_VTNR'};
 	}
-	print Dumper \@ifs if $test[3];
-	print Dumper \@ifs_bsd if $test[3];
-	log_data('dump','@ifs',\@ifs) if $b_log;
-	log_data('dump','@ifs_bsd',\@ifs_bsd) if $b_log;
+	main::log_data('data',"tty:$client{'tty-number'}") if $b_log;
 	eval $end if $b_log;
 }
-
-sub set_lsblk {
-	eval $start if $b_log;
-	$b_lsblk = 1;
-	if ($alerts{'lsblk'} && $alerts{'lsblk'}->{'path'}){
-		my $cmd = $alerts{'lsblk'}->{'path'} . ' -bP --output NAME,TYPE,RM,FSTYPE,SIZE,LABEL,UUID,';
-		$cmd .= 'SERIAL,MOUNTPOINT,PHY-SEC,LOG-SEC,PARTFLAGS,MAJ:MIN,PKNAME 2>/dev/null';
-		my $pattern = 'NAME="([^"]*)"\s+TYPE="([^"]*)"\s+RM="([^"]*)"\s+';
-		$pattern .= 'FSTYPE="([^"]*)"\s+SIZE="([^"]*)"\s+LABEL="([^"]*)"\s+';
-		$pattern .= 'UUID="([^"]*)"\s+SERIAL="([^"]*)"\s+MOUNTPOINT="([^"]*)"\s+';
-		$pattern .= 'PHY-SEC="([^"]*)"\s+LOG-SEC="([^"]*)"\s+PARTFLAGS="([^"]*)"\s+';
-		$pattern .= 'MAJ:MIN="([^"]*)"\s+PKNAME="([^"]*)"';
-		my @working = main::grabber($cmd);
-		foreach (@working){
-			if (/$pattern/){
-				my $size = ($5) ? $5/1024: 0;
-				# some versions of lsblk do not return serial, fs, uuid, or label
-				push(@lsblk, {
-				'name' => $1, 
-				'type' => $2,
-				'rm' => $3, 
-				'fs' => $4, 
-				'size' => $size,
-				'label' => $6,
-				'uuid' => $7,
-				'serial' => $8,
-				'mount' => $9,
-				'block-physical' => $10,
-				'block-logical' => $11,
-				'partition-flags' => $12,
-				'maj-min' => $13,
-				'parent' => $14,
-				});
-				# must be below assignments!! otherwise the result of the match replaces values
-				# note: for bcache and luks, the device that has that fs is the parent!!
-				if ($show{'logical'}){
-					$b_active_lvm = 1 if !$b_active_lvm && $2 && $2 eq 'lvm';
-					if (!$b_active_general && (($4 && ($4 eq 'crypto_LUKS' || $4 eq 'bcache')) 
-					    || ($2 && ($2 eq 'dm' && $1 =~ /veracrypt/i) || 
-					    $2 eq 'crypto' || $2 eq 'mpath' || $2 eq 'multipath'))){
-						$b_active_general = 1;
-					}
-				}
-			}
-		}
-	}
-	#print Data::Dumper::Dumper \@lsblk;
-	main::log_data('dump','@lsblk',\@lsblk) if $b_log;
-	eval $end if $b_log;
 }
 
-sub set_mapper {
-	eval $start if $b_log;
-	$b_mapper = 1;
-	return if ! -d '/dev/mapper';
-	foreach ((globber('/dev/mapper/*'))){
-		my ($key,$value) = ($_,Cwd::abs_path("$_"));
-		next if !$value;
-		$key =~ s|^/.*/||;
-		$value =~ s|^/.*/||;
-		$mapper{$key} = $value;
-	}
-	%dmmapper = reverse %mapper if %mapper;
-	eval $end if $b_log;
-}
-
-sub set_proc_partitions {
-	eval $start if $b_log;
-	$b_proc_partitions = 1;
-	if (my $file = main::system_files('partitions')){
-		@proc_partitions = main::reader($file,'strip');
-		shift @proc_partitions; # get rid of headers
-		@proc_partitions = map {
-			my @temp = split(/\s+/, $_);
-			next if ! defined $temp[2];
-			[$temp[0],$temp[1],$temp[2],$temp[3]];
-		} @proc_partitions;
-	}
-	eval $end if $b_log;
-}
-
-sub set_ps_aux {
-	eval $start if $b_log;
-	my ($header,@temp);
-	@ps_aux = grabber("ps aux 2>/dev/null",'','strip');
-	if (@ps_aux){
-		$header = shift @ps_aux; # get rid of header row
-		# handle busy box, which has 3 columns, regular ps aux has 11
-		# avoid deprecated implicit split error in older Perls
-		@temp = split(/\s+/, $header);
-	}
-	$ps_cols = $#temp;
-	if ($ps_cols < 10){
-		my $version = qx(ps --version 2>&1);
-		$b_bb_ps = 1 if $version =~ /busybox/i;
-	}
-	return if !@ps_aux; # note: mips/openwrt ps has no 'a'
-	$_=lc for @ps_aux; # this is a super fast way to set to lower
-	# note: regular perl /.../inxi but sudo /.../inxi is added for sudo start
-	# for pinxi, we want to see the useage data for cpu/ram
-	@ps_aux = grep {!/\/$self_name\b/} @ps_aux if $self_name eq 'inxi';
-	# this is for testing for the presence of the command
-	@ps_cmd = grep {!/^\[/} map {
-		my @split = split(/\s+/, $_);
-		# slice out 10th to last elements of ps aux rows
-		my $final = $#split;
-		# some stuff has a lot of data, chrome for example
-		$final = ($final > ($ps_cols + 2) ) ? $ps_cols + 2 : $final;
-		@split = @split[$ps_cols .. $final];
-		join(' ', @split);
-	} @ps_aux;
-	#@ps_cmd = grep {!/^\[/} @ps_cmd;
-	# never, because ps loaded before option handler
-	print Dumper \@ps_cmd if $test[5];
-	eval $end if $b_log;
-}
-
-sub set_ps_gui {
-	eval $start if $b_log;
-	$b_ps_gui = 1;
-	my ($working,@match,@temp);
-	# desktops / wm (some wm also compositors)
-	if ($show{'system'}){
-		@temp=qw(razor-desktop razor-session lxsession lxqt-session 
-		tdelauncher tdeinit_phase1);
-		push(@match,@temp);
-		@temp=qw(3dwm 9wm afterstep aewm aewm\+\+ amiwm antiwm awesome
-		blackbox bspwm 
-		cagebreak calmwm (sh|c?lisp).*clfswm (openbsd-)?cwm dwm evilwm 
-		fluxbox flwm flwm_topside fvwm.*-crystal fvwm1 fvwm2 fvwm3 fvwm95 fvwm 
-		i3 instantwm ion3 jbwm jwm larswm lwm 
-		matchbox-window-manager mini musca mwm nawm notion 
-		openbox orbital pekwm perceptia python.*qtile qtile qvwm ratpoison 
-		sawfish scrotwm spectrwm (sh|c?lisp).*stumpwm sway 
-		tinywm tvtwm twm 
-		waycooler way-cooler windowlab WindowMaker wm2 wmii2 wmii wmx 
-		xfdesktop xmonad yeahwm);
-		push(@match,@temp);
-	}
-	# wm:
-	if ($show{'system'} && $extra > 1){
-		@temp=qw(budgie-wm compiz deepin-wm gala gnome-shell
-		twin kwin_wayland kwin_x11 kwin marco 
-		deepin-metacity metacity metisse mir muffin deepin-mutter mutter
-		ukwm xfwm4 xfwm5);
-		push(@match,@temp);
-		# startx: /bin/sh /usr/bin/startx
-		@temp=qw(ly .*startx xinit); # possible dm values
-		push(@match,@temp);
-	}
-	# info: NOTE: glx-dock is cairo-dock
-	if ($show{'system'} && $extra > 2){
-		@temp=qw(alltray awn bar bmpanel bmpanel2 budgie-panel 
-		cairo-dock dde-dock dmenu dockbarx docker docky dzen dzen2
-		fbpanel fspanel glx-dock gnome-panel hpanel i3bar icewmtray 
-		kdocker kicker latte latte-dock lemonbar ltpanel lxpanel lxqt-panel 
-		matchbox-panel mate-panel ourico
-		perlpanel plank plasma-desktop plasma-netbook polybar pypanel
-		razor-panel razorqt-panel stalonetray swaybar taskbar tint2 trayer
-		ukui-panel vala-panel wbar wharf wingpanel witray 
-		xfce4-panel xfce5-panel xmobar yabar);
-		push(@match,@temp);
-	}
-	# compositors (for wayland these are also the server, note.
-	# for wayland always show, so always load these
-	if ($show{'graphic'} && $extra > 0){
-		@temp=qw(3dwm asc budgie-wm compiz compton deepin-wm dwc dcompmgr 
-		enlightenment fireplace gnome-shell grefson kmscon kwin_wayland kwin_x11
-		liri marco metisse mir moblin motorcar muffin mutter
-		orbital papyros perceptia picom rustland sommelier sway swc
-		ukwm unagi unity-system-compositor
-		wavy waycooler way-cooler wayfire wayhouse westford weston xcompmgr);
-		push(@match,@temp);
-	}
-	uniq(\@match);
-	my $matches = join('|', @match);
-	foreach (@ps_cmd){
-		if (/^(|[\S]*\/)($matches)(\/|\s|$)/){
-			$working = $2;
-			push(@ps_gui, $working); # deal with duplicates with uniq
-		}
-	}
-	uniq(\@ps_gui) if @ps_gui;
-	print Dumper \@ps_gui if $test[5];
-	log_data('dump','@ps_gui',\@ps_gui) if $b_log;
-	eval $end if $b_log;
-}
 sub set_sysctl_data {
 	eval $start if $b_log;
 	return if !$alerts{'sysctl'} || $alerts{'sysctl'}->{'action'} ne 'use';
 	my (@temp);
 	# darwin sysctl has BOTH = and : separators, and repeats data. Why? 
-	if (!$b_fake_sysctl){
+	if (!$fake{'sysctl'}){
+		# just on odd chance we hit a bsd with /proc/cpuinfo, don't want to
+		# sleep 2x
+		if ($use{'bsd-sleep'} && !$system_files{'proc-cpuinfo'}){
+			if ($b_hires){
+				eval 'Time::HiRes::usleep($sleep)';
+			}
+			else {
+				select(undef, undef, undef, $cpu_sleep);
+			}
+		}
 		@temp = grabber($alerts{'sysctl'}->{'path'} . " -a 2>/dev/null");
 	}
 	else {
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1_sysctl_soekris6501_root.txt";
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1sysctl_lenovot500_user.txt";
+		my $file;
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1_sysctl_soekris6501_root.txt";
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd_6.1sysctl_lenovot500_user.txt";
 		## matches: compaq: openbsd-dmesg.boot-1.txt
-		my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-1.txt"; 
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-1.txt"; 
 		## matches: toshiba: openbsd-5.6-dmesg.boot-1.txt
-		#my $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-2.txt"; 
+		# $file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/openbsd-5.6-sysctl-2.txt"; 
+		$file = "$ENV{'HOME'}/bin/scripts/inxi/data/sysctl/obsd-6.8-sysctl-a-battery-sensor-1.txt"; 
 		@temp = reader($file);
 	}
 	foreach (@temp){
 		$_ =~ s/\s*=\s*|:\s+/:/;
 		$_ =~ s/\"//g;
-		push(@sysctl, $_);
-		# we're building these here so we can use these arrays to test 
-		# in each feature if we will try to build the feature for bsds
-		if (/^hw\.sensors/ && !/^hw\.sensors\.acpi(bat|cmb)/ && !/^hw.sensors.softraid/){
-			push(@sysctl_sensors, $_);
-		}
-		elsif (/^hw\.(vendor|product|version|serialno|uuid)/){
-			push(@sysctl_machine, $_);
-		}
-		elsif (/^hw\.sensors\.acpi(bat|cmb)/){
-			push(@sysctl_battery, $_);
+		push(@{$sysctl{'main'}}, $_);
+		# we're building these here so we can use these arrays per feature
+		if ($use{'bsd-audio'} && /^hw\.snd\./){
+			push(@{$sysctl{'audio'}}, $_); # not used currently, just test data
+		}
+		# note: we could use ac0 to indicate plugged in but messes with battery output
+		elsif ($use{'bsd-battery'} && /^hw\.sensors\.acpi(bat|cmb)/){
+			push(@{$sysctl{'battery'}}, $_);
+		}
+		# hw.cpufreq.temperature: 40780 :: dev.cpu0.temperature 
+		# hw.acpi.thermal.tz2.temperature: 27.9C :: hw.acpi.thermal.tz1.temperature: 42.1C
+		# hw.acpi.thermal.tz0.temperature: 42.1C
+		elsif ($use{'bsd-sensor'} &&((/^hw\.sensors/ && !/^hw\.sensors\.acpi(ac|bat|cmb)/ && 
+		 !/^hw\.sensors\.softraid/) || /^hw\.acpi\.thermal/ || /^dev\.cpu\.[0-9]+\.temp/)){
+			push(@{$sysctl{'sensor'}}, $_);
+		}
+		# Must go AFTER sensor because sometimes freebsd puts sensors in dev.cpu
+		# hw.l1dcachesize hw.l2cachesize
+		elsif ($use{'bsd-cpu'} && (/^hw\.(busfreq|clock|n?cpu|l[123].?cach|model)/ || 
+			/^dev\.cpu/ || /^machdep\.cpu/)){
+			push(@{$sysctl{'cpu'}}, $_);
+		}
+		# only activate if using the diskname feature in dboot!!
+		elsif ($use{'bsd-disk'} && /^hw\.disknames/){
+			push(@{$dboot{'disk'}}, $_);
+		}
+		elsif ($use{'bsd-kernel'} && /^kern.compiler_version/){
+			push(@{$dboot{'kernel'}}, $_);
+		}
+		elsif ($use{'bsd-machine'} && 
+		 /^(hw\.|machdep\.dmi\.(bios|board|system)-)(date|product|serial(no)?|uuid|vendor|version)/){
+			push(@{$sysctl{'machine'}}, $_);
+		}
+		# let's rely on dboot, we really just want the hardware specs for solid ID
+		# elsif ($use{'bsd-machine'} && !$dboot{'machine-vm'} && 
+		#	/(\bhvm\b|innotek|\bkvm\b|microsoft.*virtual machine|openbsd[\s-]vmm|qemu|qumranet|vbox|virtio|virtualbox|vmware)/i){
+		#	push(@{$dboot{'machine-vm'}}, $_);
+		# }
+		elsif ($use{'bsd-memory'} && /^(hw\.(physmem|usermem)|Free Memory)/){
+			push(@{$sysctl{'memory'}}, $_);
 		}
+		
+		elsif ($use{'bsd-raid'} && /^hw\.sensors\.softraid[0-9]\.drive[0-9]/){
+			push(@{$sysctl{'softraid'}}, $_);
+		}
+	}
+	if ($dbg[7]){
+		print("main\n", Dumper $sysctl{'main'});
+		print("dboot-machine-vm\n", Dumper $dboot{'machine-vm'});
+		print("audio\n", Dumper $sysctl{'audio'});
+		print("battery\n", Dumper $sysctl{'battery'});
+		print("cpu\n", Dumper $sysctl{'cpu'});
+		print("kernel\n", Dumper $sysctl{'kernel'});
+		print("machine\n", Dumper $sysctl{'machine'});
+		print("memory\n", Dumper $sysctl{'memory'});
+		print("sensors\n", Dumper $sysctl{'sensor'});
+		print("softraid\n", Dumper $sysctl{'softraid'});
 	}
-	print Dumper \@sysctl if $test[7];
 	# this thing can get really long.
 	if ($b_log){
-		#main::log_data('dump','@sysctl',\@sysctl);
+		main::log_data('dump','$sysctl{main}',$sysctl{'main'});
+		main::log_data('dump','$dboot{machine-vm}',$sysctl{'machine-vm'});
+		main::log_data('dump','$sysctl{audio}',$sysctl{'audio'});
+		main::log_data('dump','$sysctl{battery}',$sysctl{'battery'});
+		main::log_data('dump','$sysctl{cpu}',$sysctl{'cpu'});
+		main::log_data('dump','$sysctl{kernel}',$sysctl{'kernel'});
+		main::log_data('dump','$sysctl{machine}',$sysctl{'machine'});
+		main::log_data('dump','$sysctl{memory}',$sysctl{'memory'});
+		main::log_data('dump','$sysctl{sensors}',$sysctl{'sensor'});
+		main::log_data('dump','$sysctl{softraid}',$sysctl{'softraid'});
+	}
+	eval $end if $b_log;
+}
+
+sub get_uptime {
+	eval $start if $b_log;
+	my ($days,$hours,$minutes,$seconds,$sys_time,$uptime) = ('','','','','','');
+	if (check_program('uptime')){
+		$uptime = qx(uptime);
+		$uptime = trimmer($uptime);
+		if ($fake{'uptime'}){
+			# $uptime = '2:58PM  up 437 days,  8:18, 3 users, load averages: 2.03, 1.72, 1.77';
+			# $uptime = '04:29:08 up  3:18,  3 users,  load average: 0,00, 0,00, 0,00';
+			# $uptime = '10:23PM  up 5 days, 16:17, 1 user, load averages: 0.85, 0.90, 1.00';
+			# $uptime = '05:36:47 up 1 day,  3:28,  4 users,  load average: 1,88, 0,98, 0,62';
+			# $uptime = '05:36:47 up 1 day,  3 min,  4 users,  load average: 1,88, 0,98, 0,62';
+			# $uptime = '04:41:23 up  2:16,  load average: 7.13, 6.06, 3.41 # root openwrt';
+			# $uptime = '9:51 PM  up 2 mins, 1 user, load average: 0:58, 0.27, 0.11';
+			# $uptime = '05:36:47 up 3 min,  4 users,  load average: 1,88, 0,98, 0,62';
+			# $uptime = '9:51 PM  up 49 secs, 1 user, load average: 0:58, 0.27, 0.11';
+			# $uptime = '04:11am  up   0:00,  1 user,  load average: 0.08, 0.03, 0.01'; # openSUSE 13.1 (Bottle)
+			# $uptime = '11:21:43  up 1 day  5:53,  4 users,  load average: 0.48, 0.62, 0.48'; # openSUSE Tumbleweed 20210515 
+		}
+		if ($uptime){
+			# trim off and store system time and up, and cut off user/load data
+			$uptime =~ s/^([0-9:])\s*([AP]M)?.+up\s+|,?\s*([0-9]+\suser|load).*$//gi;
+			# print "ut: $uptime\n";
+			if ($1){
+				$sys_time = $1;
+				$sys_time .= lc($2) if $2;
+			}
+			if ($uptime =~ /\b([0-9]+)\s+day[s]?\b/){
+				$days = ($1 + 0) . 'd';
+			}
+			if ($uptime =~ /\b([0-9]{1,2}):([0-9]{1,2})\b/){
+				$hours = ($1 + 0) . 'h';
+				$minutes = ($2 + 0) . 'm';
+			}
+			else {
+				if ($uptime =~ /\b([0-9]+)\smin[s]?\b/){
+					$minutes = ($1 + 0) . 'm';
+				}
+				if ($uptime =~ /\b([0-9]+)\ssec[s]?\b/){
+					$seconds = ($1 + 0) . 's';
+				}
+			}
+			$days .= ' ' if $days && ($hours || $minutes || $seconds);
+			$hours .= ' ' if $hours && $minutes;
+			$minutes .= ' ' if $minutes && $seconds;
+			$uptime = $days . $hours . $minutes . $seconds;
+		}
 	}
+	$uptime ||= 'N/A';
 	eval $end if $b_log;
+	return $uptime;
 }
 
-## @usb array indexes
+## UsbData
+# %usb array indexes
 # 0 - bus id / sort id
 # 1 - device id
 # 2 - path_id
@@ -22807,42 +25792,63 @@ sub set_sysctl_data {
 # 16 - serial
 # 17 - speed
 # 18 - configuration - not used
-## USBData
+# 19 - power mW bsd only, not used yet
+# 20 - product rev number
+# 21 - driver_nu [bsd only]
 {
-package USBData;
+package UsbData;
 my (@working);
-my ($b_hub,$addr_id,$bus_id,$bus_id_alpha,$chip_id,$class_id,
-$device_id,$driver,$ids,$interfaces,$name,$path,$path_id,$product,
-$protocol_id,$serial,$speed,$subclass_id,$type,$version,$vendor,$vendor_id,);
+my (@asound_ids,$b_asound,$b_hub,$addr_id,$bus_id,$bus_id_alpha,
+$chip_id,$class_id,$device_id,$driver,$driver_nu,$ids,$interfaces,
+$name,$network_regex,$path,$path_id,$power,$product,$product_id,
+$protocol_id,$rev,$serial,$speed,$subclass_id,$type,$version,$vendor,
+$vendor_id);
 my $b_live = 1; # debugger file data
-
 sub set {
 	eval $start if $b_log;
-	$b_usb_check = 1;
+	${$_[0]} = 1; # set checked boolean
+	# note: bsd package usbutils has lsusb in it, but we dont' want it for default
+	# usbdevs is best, has most data, and runs as user
+	if ($alerts{'usbdevs'}->{'action'} eq 'use'){
+		usbdevs_data();
+	}
+	# usbconfig has weak/poor output, and requires root, only fallback
+	elsif ($alerts{'usbconfig'}->{'action'} eq 'use'){
+		usbconfig_data();
+	}
 	# if user config sets USB_SYS you can override with --usb-tool
-	if ((!$b_usb_sys || $b_usb_tool) && $alerts{'lsusb'}->{'action'} eq 'use' ){
+	elsif ((!$force{'usb-sys'} || $force{'lsusb'}) && $alerts{'lsusb'}->{'action'} eq 'use'){
 		lsusb_data();
 	}
 	elsif (-d '/sys/bus/usb/devices'){
 		sys_data('main');
 	}
-	elsif ( $alerts{'usbdevs'}->{'action'} eq 'use'){
-		usbdevs_data();
-	}
+	@{$usb{'main'}} = sort {$a->[0] cmp $b->[0]} @{$usb{'main'}} if $usb{'main'};
+	main::log_data('dump','$usb{audio}: ',$usb{'audio'}) if $b_log;
+	main::log_data('dump','$usb{bluetooth}: ',$usb{'bluetooth'}) if $b_log;
+	main::log_data('dump','$usb{graphics}: ',$usb{'graphics'}) if $b_log;
+	main::log_data('dump','$usb{network}: ',$usb{'network'}) if $b_log;
 	eval $end if $b_log;
 }
 
 sub lsusb_data {
 	eval $start if $b_log;
 	my (@temp);
-	my @data = data_grabber('lsusb');
+	my @data = usb_grabber('lsusb');
 	foreach (@data){
-		next if /^\s*$|^Couldn't/; # expensive second call: || /UNAVAIL/
+		next if /^~$|^Couldn't/; # expensive second call: || /UNAVAIL/
 		@working = split(/\s+/, $_);
 		next unless defined $working[1] && defined $working[3];
 		$working[3] =~ s/:$//;
-		# Seen FreeBSD lsusb with: 
+		# Don't use this fix, the data is garbage in general! Seen FreeBSD lsusb with: 
 		# Bus /dev/usb Device /dev/ugen0.3: ID 24ae:1003 Shenzhen Rapoo Technology Co., Ltd. 
+		# hub, note incomplete data: Bus /dev/usb Device /dev/ugen0.1: ID 0000:0000 
+		# linux: 
+		# Bus 005 Device 007: ID 0d8c:000c C-Media Electronics, Inc. Audio Adapter
+		# if ($working[3] =~ m|^/dev/ugen([0-9]+)\.([0-9]+)|){
+		#	$working[1] = $1;
+		#	$working[3] = $2;
+		# }
 		next unless main::is_numeric($working[1]) && main::is_numeric($working[3]);
 		$addr_id = int($working[3]);
 		$bus_id = int($working[1]);
@@ -22851,7 +25857,10 @@ sub lsusb_data {
 		@temp = @working[6..$#working];
 		$name = main::remove_duplicates(join(' ', @temp));
 		$name = $name;
-		#print "$name\n";
+		# $type = check_type($name,'','');
+		$type ||= '';
+		# do NOT set bus_id_alpha here!!
+		# print "$name\n";
 		$working[0] = $bus_id;
 		$working[1] = $addr_id;
 		$working[2] = $path_id;
@@ -22866,80 +25875,195 @@ sub lsusb_data {
 		$working[11] = '';
 		$working[12] = '';
 		$working[13] = $name;
-		$working[14] = '';
+		$working[14] = '';# $type;
 		$working[15] = '';
 		$working[16] = '';
 		$working[17] = '';
 		$working[18] = '';
-		push(@usb,[@working]);
-		#print join("\n",@working),"\n\n=====\n";
+		$working[19] = '';
+		$working[20] = '';
+		push(@{$usb{'main'}},[@working]);
+		# print join("\n",@working),"\n\n=====\n";
 	}
-	print Data::Dumper::Dumper \@usb if $test[6];
-	sys_data('lsusb') if @usb;
-	print Data::Dumper::Dumper \@usb if $test[6];
-	main::log_data('dump','@usb: plain',\@usb) if $b_log;
+	print Data::Dumper::Dumper $usb{'main'} if $dbg[6];
+	sys_data('lsusb') if $usb{'main'};
+	print Data::Dumper::Dumper $usb{'main'} if $dbg[6];
+	main::log_data('dump','$usb{main}: plain',$usb{'main'}) if $b_log;
+	eval $end if $b_log;
+}
+# ugen0.1: <Apple OHCI root HUB> at usbus0, cfg=0 md=HOST spd=FULL (12Mbps) pwr=SAVE (0mA)
+# ugen0.2: <MediaTek 802.11 n WLAN> at usbus0, cfg=0 md=HOST spd=FULL (12Mbps) pwr=ON (160mA)
+# note: tried getting driver/ports from dmesg, impossible, waste of time
+sub usbconfig_data {
+	eval $start if $b_log;
+	my ($cfg,$hub_id,$ports);
+	my @data = usb_grabber('usbconfig');
+	foreach (@data){
+		if ($_ eq '~' && @working){
+			$chip_id = ($vendor_id || $product_id) ? "$vendor_id:$product_id" : '';
+			$working[7] = $chip_id;
+			$product ||= '';
+			$vendor ||= '';
+			$working[13] = main::remove_duplicates("$vendor $product") if $product || $vendor;
+			# leave the ugly vendor/product ids unless chip-ID shows!
+			$working[13] = $chip_id if $extra < 2 && $chip_id && !$working[13];
+			if (defined $class_id && defined $subclass_id && defined $protocol_id){
+				$class_id = hex($class_id);
+				$subclass_id = hex($subclass_id);
+				$protocol_id = hex($protocol_id);
+				$type = device_type("$class_id/$subclass_id/$protocol_id");
+			}
+			if ($working[13] && (!$type || $type eq '<vendor defined>')){
+				$type = check_type($working[13],'','');
+			}
+			$working[14] = $type;
+			push(@{$usb{'main'}},[@working]);
+			assign_usb_type([@working]);
+			undef @working;
+		}
+		elsif (/^([a-z_-]+)([0-9]+)\.([0-9]+):\s+<[^>]+>\s+at usbus([0-9]+)\b/){
+			($class_id,$cfg,$power,$speed,$subclass_id,$type) = undef;
+			($product,$product_id,$vendor,$vendor_id) = ('','','','');
+			$hub_id = $2;
+			$addr_id = $3;
+			$bus_id = $4;
+			$path_id = "$bus_id-$hub_id.$addr_id";
+			$bus_id_alpha = bus_id_alpha($path_id);
+			if (/\bcfg\s*=\s*([0-9]+)/){
+				$cfg = $1;
+			}
+			if (/\bmd\s*=\s*([\S]+)/){
+				# nothing
+			}
+			# odd, using \b after ) doesn't work as expected
+			# note that bsd spd=FULL has no interest since we get that from the speed
+			if (/\b(speed|spd)\s*=\s*([\S]+)\s+\(([^\)]+)\)/){
+				$speed = prep_speed($3);
+			}
+			if (/\b(power|pwr)\s*=\s*([\S]+)\s+\(([0-9]+mA)\)/){
+				$power = $3;
+				process_power(\$power) if $power;
+			}
+			$working[0] = $bus_id_alpha;
+			$working[1] = $addr_id;
+			$working[2] = $path_id;
+			$working[3] = '';
+			$working[8] = usb_rev($speed);
+			$working[9] = '';
+			$working[10] = $ports;
+			$working[15] = $driver;
+			$working[17] = $speed;
+			$working[18] = $cfg;
+			$working[19] = $power;
+			$working[20] = '';
+			$working[21] = $driver_nu;
+		}
+		elsif (/^bDeviceClass\s*=\s*0x00([a-f0-9]{2})\s*(<([^>]+)>)?/){
+			$class_id = $1;
+			$working[4] = $class_id;
+		}
+		elsif (/^bDeviceSubClass\s*=\s*0x00([a-f0-9]{2})/){
+			$subclass_id = $1;
+			$working[5] = $subclass_id;
+		}
+		elsif (/^bDeviceProtocol\s*=\s*0x00([a-f0-9]{2})/){
+			$protocol_id = $1;
+			$working[6] = $protocol_id;
+		}
+		elsif (/^idVendor\s*=\s*0x([a-f0-9]{4})/){
+			$vendor_id = $1;
+		}
+		elsif (/^idProduct\s*=\s*0x([a-f0-9]{4})/){
+			$product_id = $1;
+		}
+		elsif (/^iManufacturer\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+			$vendor = main::cleaner($3);
+			$vendor =~ s/^0x.*//; # seen case where vendor string was ID
+			$working[11] = $vendor;
+		}
+		elsif (/^iProduct\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+			$product = main::cleaner($3);
+			$product =~ s/^0x.*//; # in case they put product ID in, sigh
+			$working[12] = $product;
+		}
+		elsif (/^iSerialNumber\s*=\s*0x([a-f0-9]{4})\s*(<([^>]+)>)?/){
+			$working[16] = main::cleaner($3);
+		}
+	}
+	main::log_data('dump','$usb{main}: usbconfig',$usb{'main'}) if $b_log;
+	print Data::Dumper::Dumper $usb{'main'} if $dbg[6];
 	eval $end if $b_log;
 }
-
 # Controller /dev/usb2:
 # addr 1: full speed, self powered, config 1, UHCI root hub(0x0000), Intel(0x8086), rev 1.00
 #  port 1 addr 2: full speed, power 98 mA, config 1, USB Receiver(0xc52b), Logitech(0x046d), rev 12.01
 #  port 2 powered
 sub usbdevs_data {
 	eval $start if $b_log;
-	my ($class,$hub_id,$port,$port_value);
-	my ($ports,$j,$k) = (0,0,0);
-	my @data = data_grabber('usbdevs');
+	my ($b_multi,$class,$config,$hub_id,$port,$port_value,$product_rev);
+	my ($ports) = (0);
+	my @data = usb_grabber('usbdevs');
 	foreach (@data){
-		if (/^Controller\s\/dev\/usb([0-9]+)/){
-			# $j = scalar @usb;
-			($j,$ports) = (0,0);
-			$port_value = '';
+		if ($_ eq '~' && @working){
+			$working[10] = $ports;
+			push(@{$usb{'main'}},[@working]);
+			assign_usb_type([@working]);
+			undef @working;
+			($config,$driver,$power,$rev) = ('','','','');
+		}
+		elsif (/^Controller\s\/dev\/usb([0-9]+)/){
 			$bus_id = $1;
-			@working = ();
 		}
-		elsif (/^addr\s([0-9]+):\s([^,]+),[^,]+,[^,]+,\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
-			$j = scalar @usb;
-			$k = $j;
+		elsif (/^addr\s([0-9]+):\s([^,]+),[^,0-9]+([0-9]+ mA)?,\s+config\s+([0-9]+),\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
 			$hub_id = $1;
 			$addr_id = $1;
-			$speed = $2;
-			$chip_id = "$4:$6";
-			$name = main::remove_duplicates("$5 $3");
-			#print "p1:$protocol\n";
+			$speed = prep_speed($2);
+			$power = $3;
+			$chip_id = "$6:$8";
+			$config = $4;
+			$name = main::remove_duplicates("$7 $5");
+			# print "p1:$protocol\n";
 			$path_id = "$bus_id-$hub_id";
+			$bus_id_alpha = bus_id_alpha($path_id);
+			$ports = 0;
+			process_power(\$power) if $power;
 			$port_value = '';
-			$working[0] = $bus_id;
+			$working[0] = $bus_id_alpha;
 			$working[1] = $addr_id;
-			$working[2] = $path;
+			$working[2] = $path_id;
 			$working[3] = '';
 			$working[4] = '09';
 			$working[5] = '';
 			$working[6] = '';
 			$working[7] = $chip_id;
-			$working[8] = $speed;
+			$working[8] = usb_rev($speed);
 			$working[9] = '';
-			$working[10] = 0;
+			$working[10] = $ports;
 			$working[13] = $name;
 			$working[14] = 'Hub';
 			$working[15] = '';
 			$working[16] = '';
-			$working[17] = '';
-			$working[18] = '';
-			$usb[$j] = ([@working],);
-			@working = ();
+			$working[17] = $speed;
+			$working[18] = $config;
+			$working[19] = $power;
+			$working[20] = '';
 		}
-		elsif (/^\s+port\s([0-9]+)\saddr\s([0-9]+):\s([^,]+),[^,]+,[^,]+,\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
-			$j = scalar @usb;
+		elsif (/^port\s([0-9]+)\saddr\s([0-9]+):\s([^,]+),[^,0-9]*([0-9]+\s?mA)?,\s+config\s+([0-9]+),\s?([^,]+)\(0x([0-9a-f]{4})\),\s?([^,]+)\s?\(0x([0-9a-f]{4})\)/){
 			$port = $1;
 			$addr_id = "$2";
-			$speed = "$3";
-			$chip_id = "$5:$7";
-			$name = main::remove_duplicates("$6 $4");
-			#print "p2:$protocol\n";
+			$power = $4;
+			$config = $5;
+			$speed = prep_speed($3);
+			$chip_id = "$7:$9";
+			$name = main::remove_duplicates("$8 $6");
+			$type = check_type($name,'','');
+			$type ||= '';
+			# print "p2:$protocol\n";
 			$ports++;
 			$path_id = "$bus_id-$hub_id.$port";
-			$working[0] = $bus_id;
+			$bus_id_alpha = bus_id_alpha($path_id);
+			process_power(\$power) if $power;
+			$working[0] = $bus_id_alpha;
 			$working[1] = $addr_id;
 			$working[2] = $path_id;
 			$working[3] = '';
@@ -22947,58 +26071,141 @@ sub usbdevs_data {
 			$working[5] = '';
 			$working[6] = '';
 			$working[7] = $chip_id;
-			$working[8] = $speed;
+			$working[8] = usb_rev($speed);
 			$working[9] = '';
-			$working[10] = 0;
+			$working[10] = $ports;
 			$working[11] = '';
 			$working[12] = '';
 			$working[13] = $name;
-			$working[14] = '';
+			$working[14] = $type;
+			$working[15] = '';
+			$working[16] = '';
+			$working[17] = $speed;
+			$working[18] = $config;
+			$working[19] = $power;
+			$working[20] = '';
+		}
+		elsif (/^port\s([0-9]+)\spowered/){
+			$ports++;
+		}
+		# newer openbsd usbdevs totally changed their syntax and layout, but it is better...
+		elsif (/^addr\s*([0-9a-f]+):\s+([a-f0-9]{4}:[a-f0-9]{4})\s*([^,]+)?(,\s[^,]+?)?,\s+([^,]+)$/){
+			$addr_id = $1;
+			$chip_id = $2;
+			$vendor = main::cleaner($3) if $3;
+			$vendor ||= '';
+			$name = main::remove_duplicates("$vendor $5");
+			$type = check_type($name,'','');
+			$class_id = ($name =~ /hub/i) ? '09': '01';
+			$path_id = "$bus_id-$addr_id";
+			$bus_id_alpha = bus_id_alpha($path_id);
+			$ports = 0;
+			$b_multi = 1;
+			$working[0] = $bus_id_alpha;
+			$working[1] = $addr_id;
+			$working[2] = $path_id;
+			$working[3] = '';
+			$working[4] = $class_id;
+			$working[5] = '';
+			$working[6] = '';
+			$working[7] = $chip_id;
+			$working[8] = '';
+			$working[9] = '';
+			$working[10] = $ports;
+			$working[11] = '';
+			$working[12] = '';
+			$working[13] = $name;
+			$working[14] = $type;
 			$working[15] = '';
 			$working[16] = '';
 			$working[17] = '';
 			$working[18] = '';
-			$usb[$j] = ([@working],);
-			$usb[$k]->[10] = $ports;
-			@working = ();
-		}
-		elsif (/^\s+port\s([0-9]+)\spowered/){
+			$working[19] = '';
+			$working[20] = '';
+		}
+		elsif ($b_multi && 
+		 /^([^,]+),\s+(self powered|power\s+([0-9]+\s+mA)),\s+config\s([0-9]+),\s+rev\s+([0-9\.]+)(,\s+i?Serial\s(\S*))?/i){
+			$speed = prep_speed($1);
+			$rev = usb_rev($speed);
+			$power = $3;
+			process_power(\$power) if $power;
+			$working[8] = $rev;
+			$working[16] = $7 if $7;
+			$working[17] = $speed;
+			$working[18] = $4; # config number
+			$working[19] = $power; 
+			$working[20] = $5; # product rev
+		}
+		# 1 or more drivers supported
+		elsif ($b_multi && /^driver:\s*([^,]+)$/){
+			my $temp = $1;
+			$working[4] = '09' if $temp =~ /hub[0-9]/;
+			$temp =~ s/([0-9]+)$//;
+			$working[21] = $1; # driver nu
+			# drivers, note that when numbers trimmed off, drivers can have same name
+			$working[15] = ($working[15] && $working[15] !~ /\b$temp\b/) ? "$working[15],$temp" : $temp; 
+			# now that we have the driver, let's recheck the type
+			if (!$type && $name && $working[15]){
+				$type = check_type($name,$working[15],'');
+				$working[14] = $type if $type;
+			}
+		}
+		elsif ($b_multi && /^port\s[0-9]/){
 			$ports++;
-			$usb[$k]->[10] = $ports;
 		}
 	}
-	if (@working){
-		$j = scalar @usb;
-		$usb[$j] = (
-		[@working],
-		);
-	}
-	main::log_data('dump','@usb: usbdevs',\@usb) if $b_log;
-	print Data::Dumper::Dumper \@usb if $test[6];
+	main::log_data('dump','$usb{main}: usbdevs',$usb{'main'}) if $b_log;
+	print Data::Dumper::Dumper $usb{'main'} if $dbg[6];
 	eval $end if $b_log;
 }
 
-sub data_grabber {
+sub usb_grabber {
 	eval $start if $b_log;
 	my ($program) = @_;
-	my %args = ('lsusb' => '', 'usbdevs' => '-v');
-	my (@data);
-	if ($b_live && !$b_fake_usbdevs){
-		@data = main::grabber($alerts{$program}->{'path'} . " $args{$program} 2>/dev/null");
+	my ($args,$path,$pattern,@data,@working);
+	if ($program eq 'lsusb'){
+		$args = '';
+		$path = $alerts{'lsusb'}->{'path'};
+		$pattern = '^Bus [0-9]';
+	}
+	elsif ($program eq 'usbconfig'){
+		$args = 'dump_device_desc';
+		$path = $alerts{'usbconfig'}->{'path'};
+		$pattern = '^[a-z_-]+[0-9]+\.[0-9]+:';
+	}
+	elsif ($program eq 'usbdevs'){
+		$args = '-vv';
+		$path = $alerts{'usbdevs'}->{'path'};
+		$pattern = '^(addr\s[0-9a-f]+:|port\s[0-9]+\saddr\s[0-9]+:)';
+	}
+	if ($b_live && !$fake{'usbdevs'} && !$fake{'usbconfig'}){
+		@data = main::grabber("$path $args 2>/dev/null",'','strip');
 	}
 	else {
 		my $file;
-		if ($b_fake_usbdevs){
+		if ($fake{'usbdevs'}){
 			$file = "$ENV{'HOME'}/bin/scripts/inxi/data/lsusb/bsd-usbdevs-v-1.txt";
 		}
+		elsif ($fake{'usbconfig'}){
+			$file = "$ENV{'HOME'}/bin/scripts/inxi/data/lsusb/bsd-usbconfig-list-v-1.txt";
+		}
 		else {
 			$file = "$ENV{'HOME'}/bin/scripts/inxi/data/lsusb/mdmarmer-lsusb.txt";
 		}
-		@data = main::reader($file);
+		@data = main::reader($file,'strip');
+	}
+	if (@data){
+		$use{'usb-tool'} = 1 if scalar @data > 2;
+		foreach (@data){
+			# this is the group separator and assign trigger
+			push(@working, '~') if $_ =~ /$pattern/i;
+			push(@working, $_);
+		}
+		push(@working, '~');
 	}
-	#print Data::Dumper::Dumper \@data;
+	print Data::Dumper::Dumper \@working if $dbg[30];
 	eval $end if $b_log;
-	return @data;
+	return @working;
 }
 
 sub sys_data {
@@ -23010,17 +26217,17 @@ sub sys_data {
 	my @files = main::globber('/sys/bus/usb/devices/*');
 	# we want to get rid of the hubs with x-0: syntax, those are hubs found in /usbx
 	@files = grep {!/\/[0-9]+-0:/} @files;
-	#print join("\n", @files);
+	# print join("\n", @files);
 	foreach (@files){
-		@uevent = main::reader("$_/uevent") if -r "$_/uevent";
-		$ids = main::awk(\@uevent,'^(DEVNAME|DEVICE\b)',2,'=');
-		if ( $ids){
+		# be careful, sometimes uevent is not readable
+		@uevent = (-r "$_/uevent") ? main::reader("$_/uevent") : undef;
+		if (@uevent && ($ids = main::awk(\@uevent,'^(DEVNAME|DEVICE\b)',2,'='))){
 			@drivers = ();
 			($b_hub,$class_id,$protocol_id,$subclass_id) = (0,0,0,0);
 			($configuration,$driver,$interfaces,$name,$ports,$product,$serial,$speed,
 			$type,$usb_version,$vendor) = ('','','','','','','','','','','');
-			#print Cwd::abs_path($_),"\n";
-			#print "f1: $_\n";
+			# print Cwd::abs_path($_),"\n";
+			# print "f1: $_\n";
 			$path_id = $_;
 			$path_id =~ s/^.*\///;
 			$path_id =~ s/^usb([0-9]+)/$1-0/;
@@ -23035,6 +26242,8 @@ sub sys_data {
 			$class_id = sys_item("$_/bDeviceClass");
 			# $subclass_id = sys_item("$_/bDeviceSubClass");
 			$class_id = hex($class_id) if $class_id;
+			$power = sys_item("$_/bMaxPower");
+			process_power(\$power) if $power;
 			# this populates class, subclass, and protocol id with decimal numbers
 			@drivers = uevent_data("$_/[0-9]*/uevent");
 			push(@drivers, uevent_data("$_/[0-9]*/*/uevent")) if !$b_hub;
@@ -23048,33 +26257,39 @@ sub sys_data {
 			$usb_version = sys_item("$_/version");
 			$speed = sys_item("$_/speed");
 			$configuration = sys_item("$_/configuration");
+			$power = sys_item("$_/bMaxPower");
+			process_power(\$power) if $power;
 			$class_id = sprintf("%02x", $class_id) if defined $class_id && $class_id ne '';
 			$subclass_id = sprintf("%02x", $subclass_id) if defined $subclass_id && $subclass_id ne '';
 			if ($source eq 'lsusb'){
-				for ($i = 0; $i < scalar @usb; $i++){
-					if ($usb[$i]->[0] eq $bus_id && $usb[$i]->[1] == $device_id){
-						if (!$b_hub && $usb[$i]->[13] && (!$type || $type eq '<vendor specific>' )){
-							$type = check_type($usb[$i]->[13],$driver,$type);
+				for ($i = 0; $i < scalar @{$usb{'main'}}; $i++){
+					if ($usb{'main'}->[$i][0] eq $bus_id && $usb{'main'}->[$i][1] == $device_id){
+						if (!$b_hub && $usb{'main'}->[$i][13] && (!$type || $type eq '<vendor specific>')){
+							$type = check_type($usb{'main'}->[$i][13],$driver,$type);
 						}
-						#print $type,"\n";
-						$usb[$i]->[0] = $bus_id_alpha;
-						$usb[$i]->[2] = $path_id;
-						$usb[$i]->[3] = $_;
-						$usb[$i]->[4] = $class_id;
-						$usb[$i]->[5] = $subclass_id;
-						$usb[$i]->[6] = $protocol_id;
-						$usb[$i]->[8] = $usb_version;
-						$usb[$i]->[9] = $interfaces;
-						$usb[$i]->[10] = $ports if $ports;
-						if ($type && $b_hub && (!$usb[$i]->[13] || $usb[$i]->[13] =~ /^linux foundation/i )){
-							$usb[$i]->[13] = "$type";
+						# print $type,"\n";
+						$usb{'main'}->[$i][0] = $bus_id_alpha;
+						$usb{'main'}->[$i][2] = $path_id;
+						$usb{'main'}->[$i][3] = $_;
+						$usb{'main'}->[$i][4] = $class_id;
+						$usb{'main'}->[$i][5] = $subclass_id;
+						$usb{'main'}->[$i][6] = $protocol_id;
+						$usb{'main'}->[$i][8] = $usb_version;
+						$usb{'main'}->[$i][9] = $interfaces;
+						$usb{'main'}->[$i][10] = $ports if $ports;
+						if ($type && $b_hub && (!$usb{'main'}->[$i][13] || 
+						 $usb{'main'}->[$i][13] =~ /^linux foundation/i)){
+							$usb{'main'}->[$i][13] = "$type";
 						}
-						$usb[$i]->[14] = $type if ($type && !$b_hub);
-						$usb[$i]->[15] = $driver if $driver;
-						$usb[$i]->[16] = $serial if $serial;
-						$usb[$i]->[17] = $speed if $speed;
-						$usb[$i]->[18] = $configuration;
-						#print join("\n",@{$usb[$i]}),"\n\n";# if !$b_hub; 
+						$usb{'main'}->[$i][14] = $type if ($type && !$b_hub);
+						$usb{'main'}->[$i][15] = $driver if $driver;
+						$usb{'main'}->[$i][16] = $serial if $serial;
+						$usb{'main'}->[$i][17] = $speed if $speed;
+						$usb{'main'}->[$i][18] = $configuration;
+						$usb{'main'}->[$i][19] = $power;
+						$usb{'main'}->[$i][20] = '';
+						assign_usb_type($usb{'main'}->[$i]);
+						# print join("\n",@{$usb{'main'}->[$i]}),"\n\n";# if !$b_hub; 
 						last;
 					}
 				}
@@ -23088,7 +26303,7 @@ sub sys_data {
 				$product = main::cleaner($product) if $product;
 				$vendor = sys_item("$_/manufacturer");
 				$vendor = main::cleaner($vendor) if $vendor;
-				if (!$b_hub && ($product || $vendor )){
+				if (!$b_hub && ($product || $vendor)){
 					if ($vendor && $product && $product !~ /$vendor/){
 						$name = "$vendor $product";
 					}
@@ -23103,41 +26318,43 @@ sub sys_data {
 					$name = $type;
 				}
 				$name = main::remove_duplicates($name) if $name;
-				if (!$b_hub && $name && (!$type || $type eq '<vendor specific>' )){
+				if (!$b_hub && $name && (!$type || $type eq '<vendor specific>')){
 					$type = check_type($name,$driver,$type);
 				}
 				# this isn't that useful, but save in case something shows up
-				#if ($configuration){
+				# if ($configuration){
 				#	$name = ($name) ? "$name $configuration" : $configuration;
-				#}
+				# }
 				$type = 'Hub' if $b_hub;
-				$usb[$i]->[0] = $bus_id_alpha;
-				$usb[$i]->[1] = $device_id;
-				$usb[$i]->[2] = $path_id;
-				$usb[$i]->[3] = $_;
-				$usb[$i]->[4] = $class_id;
-				$usb[$i]->[5] = $subclass_id;
-				$usb[$i]->[6] = $protocol_id;
-				$usb[$i]->[7] = "$vendor_id:$chip_id";
-				$usb[$i]->[8] = $usb_version;
-				$usb[$i]->[9] = $interfaces;
-				$usb[$i]->[10] = $ports;
-				$usb[$i]->[11] = $vendor;
-				$usb[$i]->[12] = $product;
-				$usb[$i]->[13] = $name;
-				$usb[$i]->[14] = $type;
-				$usb[$i]->[15] = $driver;
-				$usb[$i]->[16] = $serial;
-				$usb[$i]->[17] = $speed;
-				$usb[$i]->[18] = $configuration;
+				$usb{'main'}->[$i][0] = $bus_id_alpha;
+				$usb{'main'}->[$i][1] = $device_id;
+				$usb{'main'}->[$i][2] = $path_id;
+				$usb{'main'}->[$i][3] = $_;
+				$usb{'main'}->[$i][4] = $class_id;
+				$usb{'main'}->[$i][5] = $subclass_id;
+				$usb{'main'}->[$i][6] = $protocol_id;
+				$usb{'main'}->[$i][7] = "$vendor_id:$chip_id";
+				$usb{'main'}->[$i][8] = $usb_version;
+				$usb{'main'}->[$i][9] = $interfaces;
+				$usb{'main'}->[$i][10] = $ports;
+				$usb{'main'}->[$i][11] = $vendor;
+				$usb{'main'}->[$i][12] = $product;
+				$usb{'main'}->[$i][13] = $name;
+				$usb{'main'}->[$i][14] = $type;
+				$usb{'main'}->[$i][15] = $driver;
+				$usb{'main'}->[$i][16] = $serial;
+				$usb{'main'}->[$i][17] = $speed;
+				$usb{'main'}->[$i][18] = $configuration;
+				$usb{'main'}->[$i][19] = $power;
+				$usb{'main'}->[$i][20] = '';
+				assign_usb_type($usb{'main'}->[$i]);
 				$i++;
 			}
-			#print "$path_id ids: $bus_id:$device_id driver: $driver ports: $ports\n==========\n"; # if $test[6];;
+			# print "$path_id ids: $bus_id:$device_id driver: $driver ports: $ports\n==========\n"; # if $dbg[6];;
 		}
 	}
-	@usb = sort { $a->[0] cmp $b->[0] } @usb;
-	print Data::Dumper::Dumper \@usb if $source eq 'main' && $test[6];
-	main::log_data('dump','@usb: sys',\@usb) if $source eq 'main' && $b_log;
+	print Data::Dumper::Dumper $usb{'main'} if $source eq 'main' && $dbg[6];
+	main::log_data('dump','$usb{main}: sys',$usb{'main'}) if $source eq 'main' && $b_log;
 	eval $end if $b_log;
 }
 # get driver, interface [type:] data
@@ -23151,7 +26368,7 @@ sub uevent_data {
 		# print "f2: $_\n";
 		($interface) = ('');
 		@working = main::reader($_) if -r $_;
-		#print join("\n",@working), "\n";
+		# print join("\n",@working), "\n";
 		if (@working){
 			$driver = main::awk(\@working,'^DRIVER',2,'=');
 			$interface = main::awk(\@working,'^INTERFACE',2,'=');
@@ -23162,7 +26379,7 @@ sub uevent_data {
 						push(@interfaces, $interface);
 					}
 					# networking requires more data but this test is reliable
-					elsif (!@interfaces) {
+					elsif (!@interfaces){
 						$temp = $_;
 						$temp =~ s/\/uevent$//;
 						push(@interfaces, 'Network') if -d "$temp/net/";
@@ -23173,7 +26390,7 @@ sub uevent_data {
 				}
 			}
 		}
-		#print "driver:$driver\n";
+		# print "driver:$driver\n";
 		$b_hub = 1 if $driver && $driver eq 'hub';
 		$driver = '' if $driver && ($driver eq 'usb' || $driver eq 'hub');
 		push(@drivers,$driver) if $driver;
@@ -23197,15 +26414,58 @@ sub sys_item {
 	$item = main::trimmer($item) if $item;
 	return $item;
 }
-
+sub assign_usb_type {
+	my ($row) = @_;
+	# it's a hub
+	# a device will always be the second or > device on the bus, although
+	# nested hubs of course can be > 1 too. No need to build these if none of 
+	# lines are showing.
+	if (($row->[4] && $row->[4] eq '09') || 
+	  ($row->[14] && $row->[14] eq 'Hub') ||
+	  $row->[1] <= 1 ||
+	  (!$show{'audio'} && !$show{'bluetooth'} && !$show{'graphic'} && !$show{'network'})){
+		return;
+	}
+	$row->[13] = '' if !defined $row->[13]; # product
+	$row->[14] = '' if !defined $row->[14]; # type
+	$row->[15] = '' if !defined $row->[15]; # driver
+	set_asound_ids() if $show{'audio'} && !$b_asound;
+	set_network_regex() if $show{'network'} && !$network_regex;
+	# NOTE: a device, like camera, can be audio+graphic
+	if ($show{'audio'} && (
+	  (@asound_ids && $row->[7] && (grep {$row->[7] eq $_} @asound_ids)) ||
+	  ($row->[14] =~ /Audio/) || 
+	  ($row->[15] && $row->[15] =~ /audio/) ||
+	  ($row->[13] && lc($row->[13]) =~ /(audio|\bdac[0-9]*\b|headphone|\bmic(rophone)?\b)/))){
+		push(@{$usb{'audio'}},$row);
+	}
+	if ($show{'graphic'} && (
+	  $row->[14] && ($row->[14] =~ /Video/) ||
+	  ($row->[15] && $row->[15] =~ /video/) || 
+	  ($row->[13] && lc($row->[13]) =~ /(camera|\bdvb-t|\b(pc)?tv\b|video|webcam)/))){
+		push(@{$usb{'graphics'}},$row);
+	}
+	elsif ($show{'bluetooth'} && (
+	  $row->[14] && $row->[14] =~ /Bluetooth/ || 
+	  ($row->[15] && $row->[15] =~ /\b(btusb|ubt)\b/))){
+		push(@{$usb{'bluetooth'}},$row);
+	}
+	elsif ($show{'network'} && (
+	   ($row->[14] && $row->[14] =~ /(Ethernet|Network|WiFi)/i) ||
+	   ($row->[15] && $row->[15] =~ /(^ipw|^iwl|wifi)/) || 
+	   ($row->[13] && $row->[13] =~ /($network_regex)/i))){
+		# print "$1\n";
+		push(@{$usb{'network'}},$row);
+	}
+}
 sub device_type {
 	my ($data) = @_;
 	my ($type);
 	# note: the 3/0/0 value passed will be decimal, not hex
 	my @types = split('/', $data) if $data;
-	#print @types,"\n";
-	if (!@types || $types[0] eq '0' || scalar @types != 3) {return '';}
-	elsif ($types[0] eq '255') { return '<vendor specific>';}
+	# print @types,"\n";
+	if (!@types || $types[0] eq '0' || scalar @types != 3){return '';}
+	elsif ($types[0] eq '255'){ return '<vendor specific>';}
 	if (scalar @types == 3){
 		$class_id = $types[0];
 		$subclass_id = $types[1];
@@ -23254,23 +26514,120 @@ sub device_type {
 	return $type;
 }
 # device name/driver string based test, return <vendor specific> if not detected
+# for linux based tests, and empty for bsd tests
 sub check_type {
 	my ($name,$driver,$type) = @_;
 	$name = lc($name);
-	# ntoe used but if we want to add in bsd usb audio support could be good
-	if ($name =~ /(audio|hifi|sound)/){
+	if (($driver && $driver =~ /hub/) || $name =~ /\b(hub)/i){
+		$type = 'Hub';
+	}
+	elsif ($name =~ /(audio|\bdac[0-9]*\b|(head|micro|tele)phone|hifi|\bmidi\b|\bmic\b|sound)/){
 		$type = 'Audio';
 	}
 	# Broadcom HP Portable SoftSailing
-	elsif (($driver && $driver =~ /btusb/) || $name =~ /(bluetooth)/){
-		$type = 'Bluetooth';
+	elsif (($driver && $driver =~ /\b(btusb|ubt)\b/) || $name =~ /(bluetooth)/){
+		$type = 'Bluetooth'
 	}
-	elsif (($driver && $driver =~ /uvcvideo/) || $name =~ /(display|video|camera)/){
+	elsif (($driver && $driver =~ /video/) || 
+	  $name =~ /(camera|display|\bdvb-t|\b(pc)?tv\bvideo|webcam)/){
 		$type = 'Video';
 	}
-	# ethernet/wifi test not needed because NetworkData runs its own tests on the data
+	elsif ($name =~ /(wlan|wi-?fi|802\.1[15]|(11|54|108|240|300|450|1300)\s?mbps|(11|54|108|240)g\b|wireless[\s-][gn]\b|wireless.*adapter)/){
+		$type = 'WiFi';
+	}
+	# note, until freebsd match to actual drivers, these top level driver matches aren't interesting
+	elsif (($driver && $bsd_type && $driver =~ /\b(muge)\b/) || 
+	 $name =~ /(ethernet|\blan|802\.3|100?\/1000?|gigabit)/){
+		$type = 'Ethernet';
+	}
+	# note: audio devices show HID sometimes, not sure why
+	elsif ($name =~ /(joystick|keyboard|mouse|trackball)/){
+		$type = 'HID';
+	}
+	elsif (($driver && $driver =~ /^(umass)$/) || 
+	  $name =~ /\b(disk|drive|flash)\b/){
+		$type = 'Mass Storage';
+	}
 	return $type;
 }
+# linux only, will create a positive match to sound devices
+sub set_asound_ids {
+	$b_asound = 1;
+	if (-d '/proc/asound'){
+		# note: this will double the data, but it's easier this way.
+		# binxi tested for -L in the /proc/asound files, and used only those.
+		my @files = main::globber('/proc/asound/*/usbid');
+		foreach (@files){
+			my $id = main::reader($_,'',0);
+			push(@asound_ids, $id) if ($id && !(grep {/$id/} @asound_ids));
+		}
+	}
+	main::log_data('dump','@asound_ids',\@asound_ids) if $b_log;
+}
+### USB networking search string data, because some brands can have other products than
+### wifi/nic cards, they need further identifiers, with wildcards.
+### putting the most common and likely first, then the less common, then some specifics
+sub set_network_regex {
+	# belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda; 
+	# Atmel, Atheros make other stuff. NOTE: exclude 'networks': IMC Networks
+	# ralink has bluetooth as well as networking; (WG|WND?A)[0-9][0-9][0-9] netgear IDs
+	$network_regex = 'Ethernet|gigabit|\bISDN|\bLAN\b|Mobile\s?Broadband|';
+	$network_regex .= '\bNIC\b|wi-?fi|Wireless[\s-][GN]\b|WLAN|';
+	$network_regex .= '802\.(1[15]|3)|(10|11|54|108|240|300|450|1300)\s?Mbps|(11|54|108|240)g\b|100?\/1000?|';
+	$network_regex .= '(100?|N)Base-?T\b|';
+	$network_regex .= '(Actiontec|AirLink|Asus|Belkin|Buffalo|Dell|D-Link|DWA-|ENUWI-|';
+	$network_regex .= 'Ralink|Realtek|Rosewill|RNX-|Samsung|Sony|TEW-|TP-Link';
+	$network_regex .= 'Zonet.*ZEW.*).*Wireless|';
+	$network_regex .= '(\bD-Link|Network(ing)?|Wireless).*(Adapter|Interface)|';
+	$network_regex .= '(Linksys|Netgear|Davicom)|';
+	$network_regex .= 'Range(Booster|Max)|Samsung.*LinkStick|\b(WG|WND?A)[0-9][0-9][0-9]|';
+	$network_regex .= '\b(050d:935b|0bda:8189|0bda:8197)\b';
+}
+# try to guess at usb rev version from speeds
+sub usb_rev {
+	return if !$_[0] || ! main::is_numeric($_[0]);
+	my $rev;
+	if ($_[0] < 2){$rev = '1.0';}
+	elsif ($_[0] < 13){$rev = '1.1';}
+	elsif ($_[0] < 481){$rev = '2.0';}
+	elsif ($_[0] < 5001){$rev = '3.0';}
+	elsif ($_[0] < 10001){$rev = '3.1';}
+	elsif ($_[0] < 20001){$rev = '3.2';}
+	elsif ($_[0] < 40001){$rev = '4.0';}
+	return $rev;
+}
+sub prep_speed {
+	return if !$_[0];
+	my $speed = $_[0];
+	if ($_[0] =~ /^([0-9\.]+)\s*Mb/){
+		$speed = $1;
+	}
+	elsif ($_[0] =~ /^([0-9\.]+)+\s*Gb/){
+		$speed = $1 * 1000;
+	}
+	# could be 3.2, 20000 too, also superspeed+
+	elsif ($_[0] =~ /super[\s-]?speed\s?(\+|plus)/i){
+		$speed = 10000;# 3.1; # can't trust bsds to use superspeed+ but we'll hope
+	}
+	elsif ($_[0] =~ /super[\s-]?speed/i){
+		$speed = 5000;# 3.0; 
+	}
+	elsif ($_[0] =~ /hi(gh)?[\s-]?speed/i){
+		$speed = 480; # 2.0, 
+	}
+	elsif ($_[0] =~ /full[\s-]?speed/i){
+		$speed = 12; # 1.1 - could be full speed 1.1/2.0
+	}
+	elsif ($_[0] =~ /low?[\s-]?speed/i){
+		$speed = 1.5; # 1.5 - could be 1.0, or low speed 1.1/2.0
+	}
+	return $speed;
+}
+sub process_power {
+	return if !${$_[0]};
+	${$_[0]} =~ s/\s//g;
+	# ${$_[0]} = '' if ${$_[0]} eq '0mA'; # better to handle on output
+}
 # this is used to create an alpha sortable bus id for main $usb[0]
 sub bus_id_alpha {
 	my ($id) = @_;
@@ -23280,212 +26637,165 @@ sub bus_id_alpha {
 }
 }
 
+# note: seen instance in android where reading file hangs endlessly!!!
+sub get_wakeups {
+	eval $start if $b_log;
+	return if $b_arm || $b_mips || $b_ppc;
+	my ($wakeups);
+	my $path = '/sys/power/wakeup_count';
+	$wakeups = reader($path,'strip',0) if -r $path;
+	eval $end if $b_log;
+	return $wakeups;
+}
+
 ########################################################################
-#### GENERATE LINES
+#### GENERATE OUTPUT
 ########################################################################
 
-#### -------------------------------------------------------------------
-#### LINE CONTROLLERS
-#### -------------------------------------------------------------------
-
-sub assign_data {
-	my ($row) = @_;
-	return if ! %$row;
-	if ($output_type eq 'screen'){
-		print_data($row);
-	}
-	else {
-		%rows = (%rows,%$row);
-	}
-}
+## OutputGenerator
+# Also creates Short, Info, and System items
+{
+package OutputGenerator;
 
-sub generate_lines {
+sub generate {
 	eval $start if $b_log;
-	my (%row,$b_pci_check,$b_dmi_check);
-	set_ps_aux() if ! @ps_aux;
-	set_sysctl_data() if $b_sysctl;
+	my (%row,%checks);
+	main::set_ps_aux() if !$loaded{'ps-aux'};
+	main::set_sysctl_data() if $use{'sysctl'};
+	main::set_dboot_data() if $bsd_type && !$loaded{'dboot'};
 	# note: ps aux loads before logging starts, so create debugger data here
 	if ($b_log){
 		# I don't think we need to see this, it's long, but leave in case we do
-		#main::log_data('dump','@ps_aux',\@ps_aux);
-		log_data('dump','@ps_cmd',\@ps_cmd);
+		# main::log_data('dump','@ps_aux',\@ps_aux);
+		main::log_data('dump','@ps_cmd',\@ps_cmd);
 	}
-	if ( $show{'short'} ){
-		set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
-		%row = generate_short_data();
+	if ($show{'short'}){
+		%row = short_output();
 		assign_data(\%row);
 	}
 	else {
-		if ( $show{'system'} ){
-			%row = generate_system_data();
+		if ($show{'system'}){
+			%row = system_item();
 			assign_data(\%row);
 		}
-		if ( $show{'machine'} ){
-			set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check; 
-			set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
-			%row = line_handler('Machine','machine');
+		if ($show{'machine'}){
+			DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'}; 
+			%row = item_handler('Machine','machine');
 			assign_data(\%row);
 		}
-		if ( $show{'battery'} ){
-			set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check; 
-			%row = line_handler('Battery','battery');
+		if ($show{'battery'}){
+			DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'}; 
+			%row = item_handler('Battery','battery');
 			if (%row || $show{'battery-forced'}){
 				assign_data(\%row);
 			}
 		}
-		if ( $show{'ram'} ){
-			set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check; 
-			%row = line_handler('Memory','ram');
+		if ($show{'ram'}){
+			DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'}; 
+			%row = item_handler('Memory','ram');
 			assign_data(\%row);
 		}
-		if ( $show{'slot'} ){
-			set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check; 
-			%row = line_handler('PCI Slots','slot');
+		if ($show{'slot'}){
+			DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'}; 
+			%row = item_handler('PCI Slots','slot');
 			assign_data(\%row);
 		}
-		if ( $show{'cpu'} || $show{'cpu-basic'} ){
-			DeviceData::set($b_pci_check) if $b_arm && !$b_pci_check;
-			set_dmi_data($b_dmi_check) if $b_dmi && !$b_dmi_check; 
-			set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
+		if ($show{'cpu'} || $show{'cpu-basic'}){
+			DeviceData::set(\$checks{'device'}) if $b_arm && !$checks{'device'};
+			DmidecodeData::set(\$checks{'dmi'}) if $use{'dmidecode'} && !$checks{'dmi'}; 
 			my $arg = ($show{'cpu-basic'}) ? 'basic' : 'full' ;
-			%row = line_handler('CPU','cpu',$arg);
+			%row = item_handler('CPU','cpu',$arg);
 			assign_data(\%row);
 		}
-		if ( $show{'graphic'} ){
-			USBData::set() if !$b_usb_check;
-			DeviceData::set($b_pci_check) if !$b_pci_check; 
-			%row = line_handler('Graphics','graphic');
+		if ($show{'graphic'}){
+			UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+			DeviceData::set(\$checks{'device'}) if !$checks{'device'}; 
+			%row = item_handler('Graphics','graphic');
 			assign_data(\%row);
 		}
-		if ( $show{'audio'} ){
-			# Note: USBData is set internally in AudioData because it's only run in one case
-			DeviceData::set($b_pci_check) if !$b_pci_check; 
-			%row = line_handler('Audio','audio');
+		if ($show{'audio'}){
+			UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+			DeviceData::set(\$checks{'device'}) if !$checks{'device'}; 
+			%row = item_handler('Audio','audio');
 			assign_data(\%row);
 		}
-		if ( $show{'network'} ){
-			USBData::set() if !$b_usb_check;
-			DeviceData::set($b_pci_check) if !$b_pci_check; 
-			set_ip_data() if ($show{'ip'} || ($bsd_type && $show{'network-advanced'}));
-			%row = line_handler('Network','network');
+		if ($show{'network'}){
+			UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+			DeviceData::set(\$checks{'device'}) if !$checks{'device'}; 
+			IpData::set() if ($show{'ip'} || ($bsd_type && $show{'network-advanced'}));
+			%row = item_handler('Network','network');
 			assign_data(\%row);
 		}
-		if ( $show{'bluetooth'} ){
-			USBData::set() if !$b_usb_check;
-			DeviceData::set($b_pci_check) if !$b_pci_check; 
-			%row = line_handler('Bluetooth','bluetooth');
+		if ($show{'bluetooth'}){
+			UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+			DeviceData::set(\$checks{'device'}) if !$checks{'device'}; 
+			%row = item_handler('Bluetooth','bluetooth');
 			assign_data(\%row);
 		}
-		if ( $show{'logical'} ){
-			%row = line_handler('Logical','logical');
+		if ($show{'logical'}){
+			%row = item_handler('Logical','logical');
 			assign_data(\%row);
 		}
-		if ( $show{'raid'} ){
-			DeviceData::set() if !$b_pci_check; 
-			%row = line_handler('RAID','raid');
+		if ($show{'raid'}){
+			DeviceData::set(\$checks{'device'}) if !$checks{'device'}; 
+			%row = item_handler('RAID','raid');
 			assign_data(\%row);
 		}
-		if ( $show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'optical'} ){
-			set_dmesg_boot_data() if ($bsd_type && !$b_dmesg_boot_check);
-			%row = line_handler('Drives','disk');
+		if ($show{'disk'} || $show{'disk-basic'} || $show{'disk-total'} || $show{'optical'}){
+			%row = item_handler('Drives','disk');
 			assign_data(\%row);
 		}
-		if ( $show{'partition'} || $show{'partition-full'}){
-			%row = line_handler('Partition','partition');
+		if ($show{'partition'} || $show{'partition-full'}){
+			%row = item_handler('Partition','partition');
 			assign_data(\%row);
 		}
-		if ( $show{'swap'} ){
-			%row = line_handler('Swap','swap');
+		if ($show{'swap'}){
+			%row = item_handler('Swap','swap');
 			assign_data(\%row);
 		}
-		if ( $show{'unmounted'} ){
-			%row = line_handler('Unmounted','unmounted');
+		if ($show{'unmounted'}){
+			%row = item_handler('Unmounted','unmounted');
 			assign_data(\%row);
 		}
-		if ( $show{'usb'} ){
-			USBData::set() if !$b_usb_check;
-			%row = line_handler('USB','usb');
+		if ($show{'usb'}){
+			UsbData::set(\$checks{'usb'}) if !$checks{'usb'};
+			%row = item_handler('USB','usb');
 			assign_data(\%row);
 		}
-		if ( $show{'sensor'} ){
-			%row = line_handler('Sensors','sensor');
+		if ($show{'sensor'}){
+			%row = item_handler('Sensors','sensor');
 			assign_data(\%row);
 		}
-		if ( $show{'repo'} ){
-			%row = line_handler('Repos','repo');
+		if ($show{'repo'}){
+			%row = item_handler('Repos','repo');
 			assign_data(\%row);
 		}
-		if ( $show{'process'} ){
-			%row = line_handler('Processes','process');
+		if ($show{'process'}){
+			%row = item_handler('Processes','process');
 			assign_data(\%row);
 		}
-		if ( $show{'weather'} ){
-			%row = line_handler('Weather','weather');
+		if ($show{'weather'}){
+			%row = item_handler('Weather','weather');
 			assign_data(\%row);
 		}
-		if ( $show{'info'} ){
-			%row = generate_info_data();
+		if ($show{'info'}){
+			%row = info_item();
 			assign_data(\%row);
 		}
 	}
-	if ( $output_type ne 'screen' ){
-		output_handler(\%rows);
-	}
-	eval $end if $b_log;
-}
-
-sub line_handler {
-	eval $start if $b_log;
-	my ($key,$sub,$arg) = @_;
-	my %subs = (
-	'audio' => \&AudioData::get,
-	'battery' => \&BatteryData::get,
-	'bluetooth' => \&BluetoothData::get,
-	'cpu' => \&CpuData::get,
-	'disk' => \&DiskData::get,
-	'graphic' => \&GraphicData::get,
-	'logical' => \&LogicalData::get,
-	'machine' => \&MachineData::get,
-	'network' => \&NetworkData::get,
-	'partition' => \&PartitionData::get,
-	'raid' => \&RaidData::get,
-	'ram' => \&RamData::get,
-	'repo' => \&RepoData::get,
-	'process' => \&ProcessData::get,
-	'sensor' => \&SensorData::get,
-	'slot' => \&SlotData::get,
-	'swap' => \&SwapData::get,
-	'unmounted' => \&UnmountedData::get,
-	'usb' => \&UsbData::get,
-	'weather' => \&WeatherData::get,
-	);
-	my (%data);
-	my $data_name = main::key($prefix++,1,0,$key);
-	my @rows = $subs{$sub}->($arg);
-	if (@rows){
-		%data = ($data_name => \@rows,);
+	if ($output_type ne 'screen'){
+		main::output_handler(\%rows);
 	}
 	eval $end if $b_log;
-	return %data;
 }
-
-#### -------------------------------------------------------------------
-#### SHORT, DEBUG
-#### -------------------------------------------------------------------
-
-sub generate_short_data {
+## Short, Info, System Items ##
+sub short_output {
 	eval $start if $b_log;
 	my $num = 0;
 	my $kernel_os = ($bsd_type) ? 'OS' : 'Kernel';
-	get_shell_data($client{'ppid'}) if $client{'ppid'};
-	my $client = $client{'name-print'};
-	my $client_shell = ($b_irc) ? 'Client' : 'Shell';
-	if ($client{'version'}){
-		$client .= ' ' . $client{'version'};
-	}
 	my ($cpu_string,$speed,$speed_key,$type) = ('','','speed','');
-	my $memory = get_memory_data('string');
- 	my @cpu = CpuData::get('short');
+	my $memory = MemoryData::get('string');
+ 	my @cpu = CpuItem::get('short');
  	if (scalar @cpu > 1){
 		$type = ($cpu[2]) ? " (-$cpu[2]-)" : '';
 		($speed,$speed_key) = ('','');
@@ -23498,10 +26808,10 @@ sub generate_short_data {
 			$speed_key = $cpu[3];
 			$speed = $cpu[4];
 		}
-		$cpu[1] ||= row_defaults('cpu-model-null');
+		$cpu[1] ||= main::row_defaults('cpu-model-null');
 		$cpu_string = $cpu[0] . ' ' . $cpu[1] . $type;
 	}
-	elsif ($bsd_type) {
+	elsif ($bsd_type){
 		if ($alerts{'sysctl'}->{'action'}){
 			if ($alerts{'sysctl'}->{'action'} ne 'use'){
 				$cpu_string = "sysctl $alerts{'sysctl'}->{'action'}";
@@ -23513,7 +26823,7 @@ sub generate_short_data {
 			}
 		}
 	}
-	my @disk = DiskData::get('short');
+	my @disk = DriveItem::get('short');
 	# print Dumper \@disk;
 	my $disk_string = 'N/A';
 	my ($size,$used) = ('','');
@@ -23521,14 +26831,14 @@ sub generate_short_data {
 	if (@disk){
 		$size = ($disk[0]->{'logical-size'}) ? $disk[0]->{'logical-size'} : $disk[0]->{'size'};
 		# must be > 0
-		if ($size && is_numeric($size) ){
+		if ($size && main::is_numeric($size)){
 			$size_holder = $size;
-			$size = get_size($size,'string');
+			$size = main::get_size($size,'string');
 		}
 		$used = $disk[0]->{'used'};
-		if ($used && is_numeric($disk[0]->{'used'}) ){
+		if ($used && main::is_numeric($disk[0]->{'used'})){
 			$used_holder = $disk[0]->{'used'};
-			$used = get_size($used,'string');
+			$used = main::get_size($used,'string');
 		}
 		# in some fringe cases size can be 0 so only assign 'N/A' if no percents etc
 		if ($size_holder && $used_holder){
@@ -23536,23 +26846,31 @@ sub generate_short_data {
 			$disk_string = "$size$percent";
 		}
 		else {
-			$size ||= row_defaults('disk-size-0');
+			$size ||= main::row_defaults('disk-size-0');
 			$disk_string = "$used/$size";
 		}
 	}
- 	#print join('; ', @cpu), " sleep: $cpu_sleep\n";
 	$memory ||= 'N/A';
+ 	# print join('; ', @cpu), " sleep: $cpu_sleep\n";
+ 	if (!$loaded{'shell-data'} && $ppid && (!$b_irc || !$client{'name-print'})){
+		ShellData::set();
+	}
+	my $client = $client{'name-print'};
+	my $client_shell = ($b_irc) ? 'Client' : 'Shell';
+	if ($client{'version'}){
+		$client .= ' ' . $client{'version'};
+	}
 	my @data = ({
 		main::key($num++,0,0,'CPU') => $cpu_string,
 		main::key($num++,0,0,$speed_key) => $speed,
-		main::key($num++,0,0,$kernel_os) => &get_kernel_data(),
-		main::key($num++,0,0,'Up') => &get_uptime(),
+		main::key($num++,0,0,$kernel_os) => main::get_kernel_data(),
+		main::key($num++,0,0,'Up') => main::get_uptime(),
 		main::key($num++,0,0,'Mem') => $memory,
 		main::key($num++,0,0,'Storage') => $disk_string,
 		# could make -1 for ps aux itself, -2 for ps aux and self
 		main::key($num++,0,0,'Procs') => scalar @ps_aux,
 		main::key($num++,0,0,$client_shell) => $client,
-		main::key($num++,0,0,$self_name) => &get_self_version(),
+		main::key($num++,0,0,$self_name) => main::get_self_version(),
 	},);
 	my %row = (
 	main::key($prefix,1,0,'SHORT') => [(@data),],
@@ -23560,12 +26878,7 @@ sub generate_short_data {
 	eval $end if $b_log;
 	return %row;
 }
-
-#### -------------------------------------------------------------------
-#### CONSTRUCTED LINES
-#### -------------------------------------------------------------------
-
-sub generate_info_data {
+sub info_item{
 	eval $start if $b_log;
 	my $num = 0;
 	my $gcc_alt = '';
@@ -23573,7 +26886,7 @@ sub generate_info_data {
 	my $data_name = main::key($prefix++,1,0,'Info');
 	my ($b_gcc,$gcc,$index);
 	my ($gpu_ram,$parent,$percent,$total,$used) = (0,'','','','');
-	my @gccs = get_gcc_data();
+	my @gccs = main::get_gcc_data();
 	if (@gccs){
 		$gcc = shift @gccs;
 		if ($extra > 1 && @gccs){
@@ -23582,30 +26895,27 @@ sub generate_info_data {
 		$b_gcc = 1;
 	}
 	$gcc ||= 'N/A';
-	get_shell_data($client{'ppid'}) if $client{'ppid'};
-	my $client_shell = ($b_irc) ? 'Client' : 'Shell';
-	my $client = $client{'name-print'};
 	my %data = (
 	$data_name => [{
 	main::key($num++,0,1,'Processes') => scalar @ps_aux, 
-	main::key($num++,1,1,'Uptime') => &get_uptime(),
+	main::key($num++,1,1,'Uptime') => main::get_uptime(),
 	},],
 	);
-	$index = scalar(@{ $data{$data_name} } ) - 1;
+	$index = scalar(@{$data{$data_name}}) - 1;
 	if ($extra > 2){
-		my $wakeups = get_wakeups();
+		my $wakeups = main::get_wakeups();
 		$data{$data_name}->[$index]{main::key($num++,0,2,'wakeups')} = $wakeups if defined $wakeups;
 	}
-	if (!$b_mem){
-		my $memory = get_memory_data('splits');
+	if (!$loaded{'memory'}){
+		my $memory = MemoryData::get('splits');
 		if ($memory){
 			my @temp = split(':', $memory);
 			$gpu_ram = $temp[3] if $temp[3];
-			$total = ($temp[0]) ? get_size($temp[0],'string') : 'N/A';
-			$used = ($temp[1]) ? get_size($temp[1],'string') : 'N/A';
+			$total = ($temp[0]) ? main::get_size($temp[0],'string') : 'N/A';
+			$used = ($temp[1]) ? main::get_size($temp[1],'string') : 'N/A';
 			$used .= " ($temp[2]%)" if $temp[2];
 			if ($gpu_ram){
-				$gpu_ram = get_size($gpu_ram,'string');
+				$gpu_ram = main::get_size($gpu_ram,'string');
 			}
 		}
 		$data{$data_name}->[$index]{main::key($num++,1,1,'Memory')} = $total;
@@ -23614,11 +26924,11 @@ sub generate_info_data {
 	if ($gpu_ram){
 		$data{$data_name}->[$index]{main::key($num++,0,2,'gpu')} = $gpu_ram;
 	}
-	if ( (!$b_display || $b_force_display) || $extra > 0 ){
-		my %init = get_init_data();
+	if ((!$b_display || $force{'display'}) || $extra > 0){
+		my %init = main::get_init_data();
 		my $init_type = ($init{'init-type'}) ? $init{'init-type'}: 'N/A';
 		$data{$data_name}->[$index]{main::key($num++,1,1,'Init')} = $init_type;
-		if ($extra > 1 ){
+		if ($extra > 1){
 			my $init_version = ($init{'init-version'}) ? $init{'init-version'}: 'N/A';
 			$data{$data_name}->[$index]{main::key($num++,0,2,'v')} = $init_version;
 		}
@@ -23631,18 +26941,22 @@ sub generate_info_data {
 		if ($init{'runlevel'}){
 			$data{$data_name}->[$index]{main::key($num++,0,2,'runlevel')} = $init{'runlevel'};
 		}
-		if ($extra > 1 ){
+		if ($extra > 1){
 			if ($init{'default'}){
-				my $default = ($init{'init-type'} eq 'systemd' && $init{'default'} =~ /[^0-9]$/ ) ? 'target' : 'default';
+				my $default = ($init{'init-type'} eq 'systemd' && $init{'default'} =~ /[^0-9]$/) ? 'target' : 'default';
 				$data{$data_name}->[$index]{main::key($num++,0,2,$default)} = $init{'default'};
 			}
+			if ($b_admin && (my $tool = ServiceData::get('tool',''))){
+				$data{$data_name}->[$index]{main::key($num++,0,2,'tool')} = $tool;
+				undef %service_tool;
+			}
 		}
 	}
-	if ($extra > 0 ){
+	if ($extra > 0){
 		my $b_clang;
 		my $clang_version = '';
-		if (my $path = check_program('clang')){
-			$clang_version = program_version($path,'clang',3,'--version');
+		if (my $path = main::check_program('clang')){
+			$clang_version = main::program_version($path,'clang',3,'--version');
 			$clang_version ||= 'N/A';
 			$b_clang = 1;
 		}
@@ -23650,7 +26964,7 @@ sub generate_info_data {
 		$data{$data_name}->[$index]{main::key($num++,1,1,'Compilers')} = $compiler;
 		if ($b_gcc){
 			$data{$data_name}->[$index]{main::key($num++,1,2,'gcc')} = $gcc;
-			if ( $extra > 1 && $gcc_alt){
+			if ($extra > 1 && $gcc_alt){
 				$data{$data_name}->[$index]{main::key($num++,0,3,'alt')} = $gcc_alt;
 			}
 		}
@@ -23658,71 +26972,71 @@ sub generate_info_data {
 			$data{$data_name}->[$index]{main::key($num++,0,2,'clang')} = $clang_version;
 		}
 	}
-	if ($extra > 0 && !$b_pkg){
+	if ($extra > 0 && !$loaded{'packages'}){
 		my %packages = PackageData::get('inner',\$num);
 		for (keys %packages){
 			$data{$data_name}->[$index]{$_} = $packages{$_};
 		}
-		$b_pkg = 1;
 	}
-	if (!$b_irc && $extra > 1 ){
-		# bsds don't support -f option to get PPID
-		if (($b_display && !$b_force_display) && !$bsd_type){
-			$parent = get_shell_source();
+	if (!$loaded{'shell-data'} && $ppid && (!$b_irc || !$client{'name-print'})){
+		ShellData::set();
+	}
+	my $client_shell = ($b_irc) ? 'Client' : 'Shell';
+	my $client = $client{'name-print'};
+	if (!$b_irc && $extra > 1){
+		# some bsds don't support -f option to get PPPID
+		# note: root/su - does not have $DISPLAY usually
+		if ($b_display && !$force{'display'} && $ppid && $client{'pppid'}){
+			$parent = ShellData::shell_launcher();
 		}
 		else {
-			$parent = get_tty_number();
-			$parent = "tty $parent" if $parent ne '';
-		}
-		if ($parent eq 'login'){
-			$client{'su-start'} = $parent if !$client{'su-start'};
-			$parent = undef;
+			ShellData::tty_number() if !$loaded{'tty-number'};
+			$parent = "tty $client{'tty-number'}" if $client{'tty-number'} ne '';
 		}
 		# can be tty 0 so test for defined
-		$running_in = $parent if defined $parent;
-		if ($extra > 2 && $running_in && get_ssh_status() ){
+		$running_in = $parent if $parent;
+		if ($extra > 2 && $running_in && ShellData::ssh_status()){
 			$running_in .= ' (SSH)';
 		}
-	}
-	if ($extra > 2 && $client{'su-start'}){
-		$client .= " ($client{'su-start'})";
+		if ($extra > 2 && $client{'su-start'}){
+			$client .= " ($client{'su-start'})";
+		}
 	}
 	$data{$data_name}->[$index]{main::key($num++,1,1,$client_shell)} =  $client;
 	if ($extra > 0 && $client{'version'}){
 		$data{$data_name}->[$index]{main::key($num++,0,2,'v')} = $client{'version'};
 	}
-	if ($extra > 2 && $client{'default-shell'}){
-		$data{$data_name}->[$index]{main::key($num++,1,2,'default')} = $client{'default-shell'};
-		$data{$data_name}->[$index]{main::key($num++,0,3,'v')} = $client{'default-shell-v'} if $client{'default-shell-v'};
-	}
-	if ( $running_in ){
-		$data{$data_name}->[$index]{main::key($num++,0,2,'running in')} = $running_in;
+	if (!$b_irc){
+		if ($extra > 2 && $client{'default-shell'}){
+			$data{$data_name}->[$index]{main::key($num++,1,2,'default')} = $client{'default-shell'};
+			$data{$data_name}->[$index]{main::key($num++,0,3,'v')} = $client{'default-shell-v'} if $client{'default-shell-v'};
+		}
+		if ($running_in){
+			$data{$data_name}->[$index]{main::key($num++,0,2,'running-in')} = $running_in;
+		}
 	}
-	$data{$data_name}->[$index]{main::key($num++,0,1,$self_name)} = &get_self_version();
-	
+	$data{$data_name}->[$index]{main::key($num++,0,1,$self_name)} = main::get_self_version();
 	eval $end if $b_log;
 	return %data;
 }
-
-sub generate_system_data {
+sub system_item {
 	eval $start if $b_log;
 	my ($cont_desk,$ind_dm,$num) = (1,2,0);
 	my ($index);
 	my $data_name = main::key($prefix++,1,0,'System');
 	my ($desktop,$desktop_info,$desktop_key,$dm_key,$toolkit,$wm) = ('','','Desktop','dm','','');
 	my (@desktop_data,$desktop_version);
-	
 	my %data = (
 	$data_name => [{}],
 	);
-	$index = scalar(@{ $data{$data_name} } ) - 1;
+	$index = scalar(@{$data{$data_name}}) - 1;
 	if ($show{'host'}){
-		$data{$data_name}->[$index]{main::key($num++,0,1,'Host')} = get_hostname();
+		$data{$data_name}->[$index]{main::key($num++,0,1,'Host')} = main::get_hostname();
 	}
-	$data{$data_name}->[$index]{main::key($num++,1,1,'Kernel')} = get_kernel_data();
-	$data{$data_name}->[$index]{main::key($num++,0,2,'bits')} = get_kernel_bits();
+	$data{$data_name}->[$index]{main::key($num++,1,1,'Kernel')} = main::get_kernel_data();
+	$data{$data_name}->[$index]{main::key($num++,0,2,'bits')} = main::get_kernel_bits();
 	if ($extra > 0){
-		my @compiler = get_compiler_version(); # get compiler data
+		my @compiler = CompilerVersion::get(); # get compiler data
 		if (scalar @compiler != 2){
 			@compiler = ('N/A', '');
 		}
@@ -23733,13 +27047,17 @@ sub generate_system_data {
 			$data{$data_name}->[$index]{main::key($num++,0,3,'v')} = $compiler[1];
 		}
 	}
-	if ($b_admin && (my $params = get_kernel_parameters())){
-		$index = scalar(@{ $data{$data_name} } );
-		#print "$params\n";
-		$params = apply_partition_filter('system', $params, 'label') if $use{'filter-label'};
-		$params = apply_partition_filter('system', $params, 'uuid') if $use{'filter-uuid'};
+	if ($b_admin && (my $params = KernelParameters::get())){
+		$index = scalar(@{$data{$data_name}});
+		# print "$params\n";
+		if ($use{'filter-label'}){
+			$params = main::apply_partition_filter('system', $params, 'label');
+		}
+		if ($use{'filter-uuid'}){
+			$params = main::apply_partition_filter('system', $params, 'uuid');
+		}
 		$data{$data_name}->[$index]{main::key($num++,0,2,'parameters')} = $params;
-		$index = scalar(@{ $data{$data_name} } );
+		$index = scalar(@{$data{$data_name}});
 	}
 	# note: tty can have the value of 0 but the two tools 
 	# return '' if undefined, so we test for explicit ''
@@ -23749,8 +27067,8 @@ sub generate_system_data {
 		$desktop_version = $desktop_data[1] if $desktop_data[1];
 		$desktop .= ' ' . $desktop_version if $desktop_version;
 		if ($extra > 0 && $desktop_data[3]){
-			#$desktop .= ' (' . $desktop_data[2];
-			#$desktop .= ( $desktop_data[3] ) ? ' ' . $desktop_data[3] . ')' : ')';
+			# $desktop .= ' (' . $desktop_data[2];
+			# $desktop .= ($desktop_data[3]) ? ' ' . $desktop_data[3] . ')' : ')';
 			$toolkit = "$desktop_data[2] $desktop_data[3]";
 		}
 		if ($extra > 2 && $desktop_data[4]){
@@ -23759,19 +27077,21 @@ sub generate_system_data {
 		# don't print the desktop if it's a wm and the same
 		if ($extra > 1 && $desktop_data[5] && 
 		    (!$desktop_data[0] || $desktop_data[5] =~ /^(deepin.+|gnome[\s_-]shell|budgie.+)$/i || 
-		    index(lc($desktop_data[5]),lc($desktop_data[0])) == -1 )){
+		    index(lc($desktop_data[5]),lc($desktop_data[0])) == -1)){
 			$wm = $desktop_data[5];
 			$wm .= ' ' . $desktop_data[6] if $extra > 2 && $desktop_data[6];
 		}
 	}
-	if (!$b_display || ( !$desktop && $b_root)) {
-		my $tty = get_tty_number();
+	if (!$b_display || (!$desktop && $b_root)){
+		ShellData::tty_number() if !$loaded{'tty-number'};
+		my $tty = $client{'tty-number'};
 		if (!$desktop){
 			$desktop_info = '';
 		}
 		# it is defined, as ''
-		if ( $tty eq '' && $client{'console-irc'}){
-			$tty = get_tty_console_irc('vtnr');
+		if ($tty eq '' && $client{'console-irc'}){
+			ShellData::console_irc_tty() if !$loaded{'con-irc-tty'};
+			$tty = $client{'con-irc-tty'};
 		}
 		$desktop = "tty $tty" if $tty ne '';
 		$desktop_key = 'Console';
@@ -23791,16 +27111,19 @@ sub generate_system_data {
 	}
 	if ($extra > 1){
 		$data{$data_name}->[$index]{main::key($num++,0,2,'wm')} = $wm if $wm;
-		my $dms = get_display_manager();
+		if ($extra > 2 && $b_display && defined $ENV{'XDG_VTNR'}){
+			$data{$data_name}->[$index]{main::key($num++,0,2,'vt')} = $ENV{'XDG_VTNR'};
+		}
+		my $dms = main::get_display_manager();
 		if ($dms || $desktop_key ne 'Console'){
 			$dms ||= 'N/A';
 			$data{$data_name}->[$index]{main::key($num++,0,$ind_dm,$dm_key)} = $dms;
 		}
 	}
-	#if ($extra > 2 && $desktop_key ne 'Console'){
-	#	my $tty = get_tty_number();
+	# if ($extra > 2 && $desktop_key ne 'Console'){
+	#	my $tty = ShellData::tty_number() if !$loaded{'tty-number'};
 	#	$data{$data_name}->[$index]{main::key($num++,0,1,'vc')} = $tty if $tty ne '';
-	#}
+	# }
 	my $distro_key = ($bsd_type) ? 'OS': 'Distro';
 	my @distro_data = DistroData::get();
 	my $distro = $distro_data[0];
@@ -23812,6 +27135,52 @@ sub generate_system_data {
 	eval $end if $b_log;
 	return %data;
 }
+## Item Processors ##
+sub assign_data {
+	my ($row) = @_;
+	return if ! %$row;
+	if ($output_type eq 'screen'){
+		main::print_data($row);
+	}
+	else {
+		%rows = (%rows,%$row);
+	}
+}
+sub item_handler {
+	eval $start if $b_log;
+	my ($key,$sub,$arg) = @_;
+	my %subs = (
+	'audio' => \&AudioItem::get,
+	'battery' => \&BatteryItem::get,
+	'bluetooth' => \&BluetoothItem::get,
+	'cpu' => \&CpuItem::get,
+	'disk' => \&DriveItem::get,
+	'graphic' => \&GraphicItem::get,
+	'logical' => \&LogicalItem::get,
+	'machine' => \&MachineItem::get,
+	'network' => \&NetworkItem::get,
+	'partition' => \&PartitionItem::get,
+	'raid' => \&RaidItem::get,
+	'ram' => \&RamItem::get,
+	'repo' => \&RepoItem::get,
+	'process' => \&ProcessItem::get,
+	'sensor' => \&SensorItem::get,
+	'slot' => \&SlotItem::get,
+	'swap' => \&SwapItem::get,
+	'unmounted' => \&UnmountedItem::get,
+	'usb' => \&UsbItem::get,
+	'weather' => \&WeatherItem::get,
+	);
+	my (%data);
+	my $data_name = main::key($prefix++,1,0,$key);
+	my @rows = $subs{$sub}->($arg);
+	if (@rows){
+		%data = ($data_name => \@rows,);
+	}
+	eval $end if $b_log;
+	return %data;
+}
+}
 
 #######################################################################
 #### LAUNCH
@@ -23819,5 +27188,5 @@ sub generate_system_data {
 
 main(); ## From the End comes the Beginning
 
-## note: this EOF is needed for smxi handling, this is what triggers the full download ok
+## note: this EOF is needed for self updater, triggers the full download ok
 ###**EOF**###