X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=data%2Fscripts%2Finxi;h=a7c2528d3cc181eeb59d5015a4b6102b8837a02b;hp=9cfc28255fcb6ea7106e06c58f721793babe551a;hb=a181d180fafbd0a7264f2edb7b4858c4070ba95d;hpb=a035e9451bf3332cf6fcf499b25c0dbfb2a1f185

diff --git a/data/scripts/inxi b/data/scripts/inxi
index 9cfc2825..a7c2528d 100755
--- a/data/scripts/inxi
+++ b/data/scripts/inxi
@@ -1,8 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 ########################################################################
 ####  Script Name: inxi
-####  version: 1.4.8
-####  Date: March 5 2010
+####  Version: 2.1.1
+####  Date: 2014-03-14
+####  Patch Number: 00
 ########################################################################
 ####  SPECIAL THANKS
 ########################################################################
@@ -11,20 +12,22 @@
 ########################################################################
 ####  ABOUT INXI
 ########################################################################
-####  inxi is a fork of infobash 3.02, the original bash sys info script by locsmif
+####  inxi is a fork of infobash 3.02, the original bash sys info tool by locsmif
 ####  As time permits functionality improvements and recoding will occur.
 ####
-####  inxi, the universal, portable, system info script for irc.
+####  inxi, the universal, portable, system information tool for irc.
 ####  Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,
 ####  Gaim/Pidgin, Weechat, KVIrc and Kopete.
 ####  Original infobash author and copyright holder:
 ####  Copyright (C) 2005-2007  Michiel de Boer a.k.a. locsmif
-####  inxi version: Copyright (C) 2008-10 Scott Rogers & Harald Hope
+####  inxi version: Copyright (C) 2008-2014 Scott Rogers & Harald Hope
 ####  Further fixes (listed as known): Horst Tritremmel <hjt at sidux.com>
 ####  Steven Barrett (aka: damentz) - usb audio patch; swap percent used patch
+####  Jarett.Stevens - dmidecde -M patch for older systems with the /sys 
 ####
-####  Current script home page: http://techpatterns.com/forums/about1131.html
-####  Script svn: http://code.google.com/p/inxi
+####  Current script home page/wiki/svn: http://inxi.googlecode.com
+####  Script forums: http://techpatterns.com/forums/forum-33.html
+####  IRC support: irc.oftc.net channel #smxi
 ####
 ####  This program is free software; you can redistribute it and/or modify
 ####  it under the terms of the GNU General Public License as published by
@@ -42,104 +45,132 @@
 ####  If you don't understand what Free Software is, please read (or reread)
 ####  this page: http://www.gnu.org/philosophy/free-sw.html
 ########################################################################
-####  Package names in (...) are the Debian Squeeze package name. Check your 
-####  distro for proper package name by doing this: which <application> 
-####  then find what package owns that application file.
+####  * Package names in (...) are the Debian Squeeze package name. Check your 
+####    distro for proper package name by doing this: which <application> 
+####    then find what package owns that application file. Or run --recommends
+####    which shows package names for Debian/Ubuntu, Arch, and Fedora/Redhat/Suse
+####
 ####  DEPENDENCIES
-####  bash >=3.0 (bash); df, readlink, stty, tr, uname, wc (coreutils),
-####  gawk (gawk); grep (grep); hostname (hostname); lspci (pciutils),
-####  free, ps, uptime (procps); 
-####  Also the proc filesystem should be present and mounted
+####  * bash >=3.0 (bash); df, readlink, stty, tr, uname, wc (coreutils);
+####    gawk (gawk); grep (grep); lspci (pciutils);
+####    ps, uptime (procps); find (findutils)
+####  * Also the proc filesystem should be present and mounted
+####  * Some features, like -M and -d will not work, or will work incompletely,
+####    if /sys is missing
 ####
 ####	Apparently unpatched bash 3.0 has arrays broken; bug reports:
 ####	http://ftp.gnu.org/gnu/bash/bash-3.0-patches/bash30-008
 ####	http://lists.gnu.org/archive/html/bug-bash/2004-08/msg00144.html
 ####  Bash 3.1 for proper array use
 ####
-####	Arrays work in bash 2.05b, but "egrep -m" does not
+####	Arrays work in bash 2.05b, but "grep -Em" does not
 ####
 ####  RECOMMENDS (Needed to run certain features, listed by option)
 ####  -A - for output of usb audio information: lsusb (usbutils)
-####  -Ax - for audio module version: modinfo (module-init-tools)
+####  -Ax -Nx - for audio/network module version: modinfo (module-init-tools)
 ####  -Dx - for hdd temp output (root only default): hddtemp (hddtemp)
 ####       For user level hdd temp output: sudo (sudo)
 ####       Note: requires user action for this feature to run as user (edit /etc/sudoers file)
 ####  -G - full graphics output requires:  glxinfo (mesa-utils); xdpyinfo (X11-utils);
 ####       xrandr (x11-xserver-utils)
-####  -i - IP information, local/wan - ifconfig (net-tools)
+####  -i - IP information, local/wan - ip (iproute) legacy, not used if ip present: ifconfig (net-tools)
 ####  -Ix - view current runlevel while not in X window system (or with -x): runlevel (sysvinit)
+####  -M - for older systems whose kernel does not have /sys data for machine, dmidecode (dmidecode)
 ####  -o - for unmounted file system information in unmounted drives (root only default): file (file)
 ####       Note: requires user action for this feature to run as user (edit /etc/sudoers file)
 ####       For user level unmounted file system type output: sudo (sudo)
 ####  -s   For any sensors output, fan, temp, etc: sensors (lm-sensors)
 ####       Note: requires setup of lm-sensors (sensors-detect and adding modules/modprobe/reboot,
 ####       and ideally, pwmconfig) prior to full output being available. 
+####  -S   For desktop environment, user must be in X and have xprop installed (in X11-utils)
+########################################################################
+####  BSD Adjustments
+####  * sed -i '' form supported by using SED_I="-i ''".
+####  * Note: New BSD sed supports using -r instead of -E for compatibility with gnu sed
+####    However, older, like FreeBSD 7.x, does not have -r so using SED_RX='-E' for this.
+####  * Gnu grep options can be used if the function component is only run in linux
+####    These are the options that bsd grep does not support that inxi uses: -m <number> -o 
+####    so make sure if you use those to have them in gnu/linux only sections.
+####    It appears that freebsd uses gnu grep but openbsd uses bsd grep, however.
+####  * BSD ps does not support --without-headers option, and also does not support --sort <option>
+####    Tests show that -m fails to sort memory as expected, but -r does sort cpu percentage.
+####  * BSD_TYPE is set with values null, debian-bsd (debian gnu/kfreebsd), bsd (all other bsds)
+####  * Subshell and array closing ) must not be on their own line unless you use an explicit \ 
+####    to indicate that logic continues to next line where closing ) or )) are located.
 ########################################################################
 ####  CONVENTIONS:
-####  Indentation: TABS
-####  Do not use `....` (back quotes), those are totally non-reabable, use $(....).
-####  Do not use one liner flow controls. 
-####  The ONLY time you should use ';' (semi-colon) is in this single case: if [[ condition ]];then.
-####  Never use compound 'if': ie, if [[ condition ]] && statement.
-####  Note: [[ -n $something ]] - double brackets does not require quotes for variables: ie, "$something".
-####  Always use quotes, double or single, for all string values.
-####
-####  All new code/methods must be in a function.
-####  For all boolean tests, use 'true' / 'false'.
-####  !! Do NOT use 0 or 1 unless it's a function return. 
-####  Avoid complicated tests in the if condition itself.
-####  To 'return' a value in a function, use 'echo <var>'.
-####
-####  For gawk: use always if ( num_of_cores > 1 ) { hanging { starter for all blocks
-####  This lets us use one method for all gawk structures, including BEGIN/END, if, for, etc
+####  * Character Encoding: UTF-8 - this file contains special characters that must be opened and saved as UTF8
+####  * Indentation: TABS
+####  * Do not use `....` (back quotes), those are totally non-reabable, use $(....).
+####  * Do not use one liner flow controls. 
+####    The ONLY time you should use ';' (semi-colon) is in this single case: if [[ condition ]];then.
+####    Never use compound 'if': ie, if [[ condition ]] && statement.
+####  * Note: [[ -n $something ]] - double brackets does not require quotes for variables: ie, "$something".
+####  * Always use quotes, double or single, for all string values.
+####  * All new code/methods must be in a function.
+####  * For all boolean tests, use 'true' / 'false'.
+####    !! Do NOT use 0 or 1 unless it's a function return. 
+####  * Avoid complicated tests in the if condition itself.
+####  * To 'return' a value in a function, use 'echo <var>'.
+####  * For gawk: use always if ( num_of_cores > 1 ) { hanging { starter for all blocks
+####    This lets us use one method for all gawk structures, including BEGIN/END, if, for, etc
 ####
 ####  VARIABLE/FUNCTION NAMING:
-####  All functions should follow standard naming--verb adjective noun. 
-####	ie, get_cpu_data
-####  All variables MUST be initialized / declared explicitly.
-####  All variables should clearly explain what they are, except counters like i, j.
-####  Each word of variable must be separated by '_' (underscore) (camel form).
-####  Global variables are 'UPPER CASE', at top of script.
-####	ie, SOME_VARIABLE=''
-####  Local variables are 'lower case' and declared at the top of the function.
-####	ie, some_variable=''
-####  Locals that will be inherited by child functions have first char capitalized (so you know they are inherited).
-####	ie, Some_Variable 
-####
-####  Booleans should start with b_ (local) or B_ (global) and state clearly what is being tested.
-####  Arrays should start with a_ (local) or A_ (global).
+####  * All functions should follow standard naming--verb adjective noun. 
+####	  ie, get_cpu_data
+####  * All variables MUST be initialized / declared explicitly, either top of file, for Globals, or using local
+####  * All variables should clearly explain what they are, except counters like i, j.
+####  * Each word of Bash variable must be separated by '_' (underscore) (camel form), like: cpu_data
+####  * Each word of Gawk variable must be like this (first word lower, following start with upper): cpuData
+####  * Global variables are 'UPPER CASE', at top of this file.
+####	  ie, SOME_VARIABLE=''
+####  * Local variables are 'lower case' and declared at the top of the function using local, always.
+####	  ie: local some_variable=''
+####  * Locals that will be inherited by child functions have first char capitalized (so you know they are inherited).
+####	  ie, Some_Variable 
+####  * Booleans should start with b_ (local) or B_ (global) and state clearly what is being tested.
+####  * Arrays should start with a_ (local) or A_ (global).
 ####
 ####  SPECIAL NOTES:
-####  The color variable ${C2} must always be followed by a space unless you know what
-####  character is going to be next for certain. Otherwise irc color codes can be accidentally
-####  activated or altered.
-####
-####  For native script konversation support (check distro for correct konvi scripts path):
-####  ln -s <path to inxi> /usr/share/apps/konversation/scripts/inxi
-####  DCOP doesn't like \n, so avoid using it for most output unless required, as in error messages.
+####  * The color variable ${C2} must always be followed by a space unless you know what
+####    character is going to be next for certain. Otherwise irc color codes can be accidentally
+####    activated or altered.
+####  * For native script konversation support (check distro for correct konvi scripts path):
+####    ln -s <path to inxi> /usr/share/apps/konversation/scripts/inxi
+####    DCOP doesn't like \n, so avoid using it for most output unless required, as in error messages.
+####  * print_screen_output " " # requires space, not null, to avoid error in for example in irssi
+####  * For logging of array data, array must be placed into the temp_array, otherwise only the first key logs
+####  * In gawk search patterns, . is a wildcard EXCEPT in [0-9.] type containers, then it's a literal
+####    So outside of bracketed items, it must be escaped, \. but inside, no need. Outside of gawk it should 
+####    be escaped in search patterns if you are using it as a literal.
+####  
+####  PACKAGE MANAGER DATA (note, while inxi tries to avoid using package managers to get data, sometimes 
+####  it's the only way to get some data):
+####  * dpkg options: http://www.cyberciti.biz/howto/question/linux/dpkg-cheat-sheet.php
+####  * pacman options: https://wiki.archlinux.org/index.php/Pacman_Rosetta
 ####
 ####  As with all 'rules' there are acceptions, these are noted where used.
-####
 ###################################################################################
 ####	KDE Konversation information.  Moving from dcop(qt3/KDE3) to dbus(qt4/KDE4)
 ###################################################################################
-####	dcop and dbus	-- these talk back to Konversation from this script
-####	
-####	Scripting info	-- http://konversation.berlios.de/docs/scripting.html
-####			-- http://www.kde.org.uk/apps/konversation/
-####
-####	dbus info	-- http://dbus.freedesktop.org/doc/dbus-tutorial.html
-####	view dbus info	-- https://fedorahosted.org/d-feet/
-####			-- or run qdbus
-####	Konvi dbus/usage-- qdbus org.kde.konversation /irc say <server> <target-channel> <output>
-####
-####	Python usage	-- http://wiki.python.org/moin/DbusExamples  (just in case)
+####  * dcop and dbus	-- these talk back to Konversation from this program
+####  * Scripting info	-- http://konversation.berlios.de/docs/scripting.html
+####    -- http://www.kde.org.uk/apps/konversation/
+####  * dbus info	-- http://dbus.freedesktop.org/doc/dbus-tutorial.html
+####    view dbus info	-- https://fedorahosted.org/d-feet/
+####    -- or run qdbus
+####  * Konvi dbus/usage-- qdbus org.kde.konversation /irc say <server> <target-channel> <output>
+####  * Python usage	-- http://wiki.python.org/moin/DbusExamples  (just in case)
 ####
 ####	Because webpages come and go, the above information needs to be moved to inxi's wiki
-####	
 ########################################################################
 ####  Valuable Resources
+####  CPU flags: http://unix.stackexchange.com/questions/43539/what-do-the-flags-in-proc-cpuinfo-mean
+####  Advanced Bash: http://wiki.bash-hackers.org/syntax/pe
 ####  gawk arrays: http://www.math.utah.edu/docs/info/gawk_12.html
+####  raid mdstat: http://www-01.ibm.com/support/docview.wss?uid=isg3T1011259
+####               http://www.howtoforge.com/replacing_hard_disks_in_a_raid1_array
+####               https://raid.wiki.kernel.org/index.php/Mdstat
 ########################################################################
 ####  TESTING FLAGS
 ####  inxi supports advanced testing triggers to do various things, using -! <arg>
@@ -152,7 +183,7 @@
 ####  -! 13 - triggers an update from svn branch three - if present, of course
 ####  -! 14 - triggers an update from svn branch four - if present, of course
 ####  -! <http://......> - Triggers an update from whatever server you list.
-#### LOG FLAGS (logs to $HOME/.inxi/inxi.log with rotate 3 total)
+####  LOG FLAGS (logs to $HOME/.inxi/inxi.log with rotate 3 total)
 ####  -@ 8  - Basic data logging of generated data / array values
 ####  -@ 9  - Full logging of all data used, including cat of files and system data
 ####  -@ 10 - Basic data logging plus color code logging
@@ -162,78 +193,147 @@
 
 ## NOTE: we can use hwinfo if it's available in all systems, or most, to get
 ## a lot more data and verbosity levels going
-# set to default LANG to avoid locales errors with , or .
-LANG=C
-### Variable initializations: null values
-CMDL_MAX=''
-COLOR_SCHEME=''
-COLOR_SCHEME_SET=''
+
+### DISTRO MAINTAINER FLAGS ###
+# flag to allow distro maintainers to turn off update features. If false, turns off
+# -U and -! testing/advanced update options, as well as removing the -U help menu item
+# NOTE: Usually you want to create these in /etc/inxi.conf to avoid having to update each time
+B_ALLOW_UPDATE='true'
+B_ALLOW_WEATHER='true'
+
+### USER CONFIGS: SET IN inxi.conf file see wiki for directions ###
+# http://code.google.com/p/inxi/wiki/script_configuration_files
 # override in user config if desired, seems like less than .3 doesn't work as reliably
 CPU_SLEEP='0.3' 
-IRC_CLIENT=''
-IRC_CLIENT_VERSION=''
+FILTER_STRING='<filter>'
+
+# for features like help/version will fit to terminal / console screen width. Console
+# widths will be dynamically set in main() based on cols in term/console
+COLS_MAX_CONSOLE='115'
+COLS_MAX_IRC='105'
 PS_COUNT=5
-PS_THROTTLED=''
-REPO_DATA=''
-REPO_FILE_ID=''
+# change to less, or more if you have very slow connection
+WGET_TIMEOUT=8
+### END USER CONFIGS ###
+
+### LOCALIZATION - DO NOT CHANGE! ###
+# set to default LANG to avoid locales errors with , or .
+LANG=C
+# Make sure every program speaks English.
+LC_ALL="C"
+export LC_ALL
+
+### ARRAYS ###
+## Prep
+# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
+# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
+# therefore results in nothing.
+shopt -u nullglob
+## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
+# Backup the current Internal Field Separator
+ORIGINAL_IFS="$IFS"
 
-### primary data array holders	## usage: 'A_<var>'
+## Initialize
+A_ALSA_DATA=''
 A_AUDIO_DATA=''
 A_CMDL=''
 A_CPU_CORE_DATA=''
 A_CPU_DATA=''
 A_CPU_TYPE_PCNT_CCNT=''
 A_DEBUG_BUFFER=''
-A_GFX_CARD_DATA=''
+A_GCC_VERSIONS=''
 A_GLX_DATA=''
+A_GRAPHICS_CARD_DATA=''
+A_GRAPHIC_DRIVERS=''
 A_HDD_DATA=''
+A_INIT_DATA=''
 A_INTERFACES_DATA=''
+A_MACHINE_DATA=''
 A_NETWORK_DATA=''
+A_OPTICAL_DRIVE_DATA=''
 A_PARTITION_DATA=''
+A_PCICONF_DATA=''
 A_PS_DATA=''
+A_RAID_DATA=''
 A_SENSORS_DATA=''
 A_UNMOUNTED_PARTITION_DATA=''
-A_X_DATA=''
-
-### Boolean true/false globals	## usage: 'B_<var>'
-# flag to allow distro maintainers to turn off update features. If false, turns off
-# -U and -! testing/advanced update options, as well as removing the -U help menu item
-B_ALLOW_UPDATE='true'
+A_WEATHER_DATA=''
+A_DISPLAY_SERVER_DATA=''
+
+### BOOLEANS ###
+## standard boolean flags ##
+B_BSD_RAID='false'
+B_COLOR_SCHEME_SET='false'
+B_CONSOLE_IRC='false'
 # triggers full display of cpu flags
 B_CPU_FLAGS_FULL='false'
 # test for dbus irc client
 B_DBUS_CLIENT='false'
+# kde dcop
+B_DCOP='false'
 # Debug flood override: make 'true' to allow long debug output
 B_DEBUG_FLOOD='false'
+B_DMIDECODE_SET='false'
 # show extra output data
 B_EXTRA_DATA='false'
+# triggered by -xx
+B_EXTRA_EXTRA_DATA='false'
+B_ID_SET='false'
 # override certain errors due to currupted data
 B_HANDLE_CORRUPT_DATA='false'
+B_LABEL_SET='false'
+B_LSPCI='false'
 B_LOG_COLORS='false'
 B_LOG_FULL_DATA='false'
+B_MAPPER_SET='false'
+B_OUTPUT_FILTER='false'
+B_OVERRIDE_FILTER='false'
+B_PCICONF='false'
+B_PCICONF_SET='false'
+# kde qdbus
+B_QDBUS='false'
+B_PORTABLE='false'
+B_RAID_SET='false'
 B_ROOT='false'
-# Running in a shell? Defaults to false, and is determined later.
-B_RUNNING_IN_SHELL='false'
+B_RUN_COLOR_SELECTOR='false'
+B_RUNNING_IN_DISPLAY='false' # in x type display server
+if tty >/dev/null;then
+	B_RUNNING_IN_SHELL='true'
+else
+	B_RUNNING_IN_SHELL='false'
+fi
 # this sets the debug buffer
 B_SCRIPT_UP='false'
+B_SHOW_ADVANCED_NETWORK='false'
 # Show sound card data
 B_SHOW_AUDIO='false'
+B_SHOW_BASIC_RAID='false'
+B_SHOW_BASIC_CPU='false'
+B_SHOW_BASIC_DISK='false'
+B_SHOW_BASIC_OPTICAL='false'
 B_SHOW_CPU='false'
+B_SHOW_DISPLAY_DATA='false'
+B_SHOW_DISK_TOTAL='false'
 B_SHOW_DISK='false'
 # Show full hard disk output
 B_SHOW_FULL_HDD='false'
+B_SHOW_FULL_OPTICAL='false'
 B_SHOW_GRAPHICS='false'
-# Set this to 'false' to avoid printing the hostname
+# Set this to 'false' to avoid printing the hostname, can be set false now
 B_SHOW_HOST='true'
 B_SHOW_INFO='false'
 B_SHOW_IP='false'
 B_SHOW_LABELS='false'
+B_SHOW_MACHINE='false'
 B_SHOW_NETWORK='false'
 # either -v > 3 or -P will show partitions
 B_SHOW_PARTITIONS='false'
 B_SHOW_PARTITIONS_FULL='false'
 B_SHOW_PS_CPU_DATA='false'
 B_SHOW_PS_MEM_DATA='false'
+B_SHOW_RAID='false'
+# because many systems have no mdstat file, -b/-F should not show error if no raid file found
+B_SHOW_RAID_R='false' 
 B_SHOW_REPOS='false'
 B_SHOW_SENSORS='false'
 # triggers only short inxi output
@@ -241,71 +341,49 @@ B_SHOW_SHORT_OUTPUT='false'
 B_SHOW_SYSTEM='false'
 B_SHOW_UNMOUNTED_PARTITIONS='false'
 B_SHOW_UUIDS='false'
+B_SHOW_WEATHER='false'
+B_SYSCTL='false'
 # triggers various debugging and new option testing
 B_TESTING_1='false'
 B_TESTING_2='false'
+B_UPLOAD_DEBUG_DATA='false'
+B_USB_NETWORKING='false'
 # set to true here for debug logging from script start
 B_USE_LOGGING='false'
-# Test for X running
-B_X_RUNNING='false'
+B_UUID_SET='false'
+B_XORG_LOG='false'
 
-### Directory/file exist flags; test as [[ $(boolean) ]] not [[ $boolean ]]
+## Directory/file exist flags; test as [[ $(boolean) ]] not [[ $boolean ]]
 B_ASOUND_DEVICE_FILE='false'
 B_ASOUND_VERSION_FILE='false'
 B_BASH_ARRAY='false'
 B_CPUINFO_FILE='false'
+B_DMESG_BOOT_FILE='false' # bsd only
 B_LSB_FILE='false'
+B_MDSTAT_FILE='false'
 B_MEMINFO_FILE='false'
 B_MODULES_FILE='false' #
 B_MOUNTS_FILE='false'
+B_OS_RELEASE_FILE='false' # new default distro id file? will this one work where lsb-release didn't?
 B_PARTITIONS_FILE='false' #
 B_PROC_DIR='false'
 B_SCSI_FILE='false'
 
-### File's used when present
-FILE_ASOUND_DEVICE='/proc/asound/cards'
-FILE_ASOUND_VERSION='/proc/asound/version'
-FILE_CPUINFO='/proc/cpuinfo'
-FILE_LSB_RELEASE='/etc/lsb-release'
-FILE_MEMINFO='/proc/meminfo'
-FILE_MODULES='/proc/modules'
-FILE_MOUNTS='/proc/mounts'
-FILE_PARTITIONS='/proc/partitions'
-FILE_SCSI='/proc/scsi/scsi'
-
 ## app tested for and present, to avoid repeat tests
 B_FILE_TESTED='false'
 B_HDDTEMP_TESTED='false'
 B_MODINFO_TESTED='false'
 B_SUDO_TESTED='false'
-FILE_PATH=''
-HDDTEMP_PATH=''
-MODINFO_PATH=''
-SUDO_PATH=''
 
-### Variable initializations: constants
+### CONSTANTS/INITIALIZE - SOME MAY BE RESET LATER ###
 DCOPOBJ="default"
 DEBUG=0 # Set debug levels from 1-10 (8-10 trigger logging levels)
 # Debug Buffer Index, index into a debug buffer storing debug messages until inxi is 'all up'
 DEBUG_BUFFER_INDEX=0
 ## note: the debugger rerouting to /dev/null has been moved to the end of the get_parameters function
 ## so -@[number] debug levels can be set if there is a failure, otherwise you can't even see the errors
-
-# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Set to any other valid scheme you like.
-# Same as runtime parameter.
-DEFAULT_SCHEME=2
-
-# Default indentation level
-INDENT=10
-
-# logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level >= 8
-LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
-LOGFE_STRING='log_function_data fe $FUNCNAME'
-LOGFS=''
-LOGFE=''
-# uncomment for debugging from script start
-# LOGFS=$LOGFS_STRING
-# LOGFE=$LOGFE_STRING
+SED_I='-i' # for gnu sed, will be set to -i '' for bsd sed
+SED_RX='-r' # for gnu sed, will be set to -E for bsd sed for backward compatibility
 
 # default to false, no konversation found, 1 is native konvi (qt3/KDE3) script mode, 2 is /cmd inxi start,
 ##	3 is Konversation > 1.2 (qt4/KDE4) 
@@ -313,7 +391,7 @@ KONVI=0
 # NO_CPU_COUNT=0	# Wether or not the string "dual" or similar is found in cpuinfo output. If so, avoid dups.
 # This is a variable that controls how many parameters inxi will parse in a /proc/<pid>/cmdline file before stopping.
 PARAMETER_LIMIT=30
-SCHEME=0 # set default scheme
+SCHEME=0 # set default scheme - do not change this, it's set dynamically
 # this is set in user prefs file, to override dynamic temp1/temp2 determination of sensors output in case
 # cpu runs colder than mobo
 SENSORS_CPU_NO=''
@@ -322,87 +400,227 @@ SHOW_IRC=2
 # Verbosity level defaults to 0, this can also be set with -v0, -v2, -v3, etc as a parameter.
 VERBOSITY_LEVEL=0
 # Supported number of verbosity levels, including 0
-VERBOSITY_LEVELS=5
+VERBOSITY_LEVELS=7
 
-# Clear nullglob, because it creates unpredictable situations with IFS=$'\n' ARR=($VAR) IFS="$ORIGINAL_IFS"
-# type constructs. Stuff like [rev a1] is now seen as a glob expansion pattern, and fails, and
-# therefore results in nothing.
-shopt -u nullglob
-## info on bash built in: $IFS - http://tldp.org/LDP/abs/html/internalvariables.html
-# Backup the current Internal Field Separator
-ORIGINAL_IFS="$IFS"
+### LOGGING ###
+## logging eval variables, start and end function: Insert to LOGFS LOGFE when debug level >= 8
+LOGFS_STRING='log_function_data fs $FUNCNAME "$( echo $@ )"'
+LOGFE_STRING='log_function_data fe $FUNCNAME'
+LOGFS=''
+LOGFE=''
+# uncomment for debugging from script start
+# LOGFS=$LOGFS_STRING
+# LOGFE=$LOGFE_STRING
 
-# These two determine separators in single line output, to force irc clients not to break off sections
-SEP1='-'
-SEP2='~'
+### FILE NAMES/PATHS/URLS - must be non root writable ###
+# File's used when present
+FILE_ASOUND_DEVICE='/proc/asound/cards'
+FILE_ASOUND_MODULES='/proc/asound/modules' # not used but maybe for -A?
+FILE_ASOUND_VERSION='/proc/asound/version'
+FILE_CPUINFO='/proc/cpuinfo'
+FILE_DMESG_BOOT='/var/run/dmesg.boot'
+FILE_LSB_RELEASE='/etc/lsb-release'
+FILE_MDSTAT='/proc/mdstat'
+FILE_MEMINFO='/proc/meminfo'
+FILE_MODULES='/proc/modules'
+FILE_MOUNTS='/proc/mounts'
+FILE_OS_RELEASE='/etc/os-release'
+FILE_PARTITIONS='/proc/partitions'
+FILE_SCSI='/proc/scsi/scsi'
+FILE_XORG_LOG='/var/log/Xorg.0.log' # if not found, search and replace with actual location
+
+FILE_PATH=''
+HDDTEMP_PATH=''
+MODINFO_PATH=''
+SUDO_PATH=''
 
-### Script names/paths - must be non root writable
 SCRIPT_DATA_DIR="$HOME/.inxi"
+ALTERNATE_FTP='' # for data uploads
+ALTERNATE_WEATHER_LOCATION='' # weather alternate location
 LOG_FILE="$SCRIPT_DATA_DIR/inxi.log"
 LOG_FILE_1="$SCRIPT_DATA_DIR/inxi.1.log"
 LOG_FILE_2="$SCRIPT_DATA_DIR/inxi.2.log"
-SCRIPT_NAME="inxi"
-SCRIPT_PATH=""			#filled-in in Main
+MAN_FILE_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/inxi.1.gz'
+MAN_FILE_LOCATION='/usr/share/man/man1'
+SCRIPT_NAME='inxi'
+SCRIPT_PATCH_NUMBER=''
+SCRIPT_PATH='' #filled-in in Main
 SCRIPT_VERSION_NUMBER=""	#filled-in in Main
 SCRIPT_DOWNLOAD='http://inxi.googlecode.com/svn/trunk/'
 SCRIPT_DOWNLOAD_BRANCH_1='http://inxi.googlecode.com/svn/branches/one/'
 SCRIPT_DOWNLOAD_BRANCH_2='http://inxi.googlecode.com/svn/branches/two/'
 SCRIPT_DOWNLOAD_BRANCH_3='http://inxi.googlecode.com/svn/branches/three/'
 SCRIPT_DOWNLOAD_BRANCH_4='http://inxi.googlecode.com/svn/branches/four/'
+SCRIPT_DOWNLOAD_BRANCH_BSD='http://inxi.googlecode.com/svn/branches/bsd/'
+SCRIPT_DOWNLOAD_BRANCH_GNUBSD='http://inxi.googlecode.com/svn/branches/gnubsd/'
 SCRIPT_DOWNLOAD_DEV='http://smxi.org/test/'
+# note, you can use any ip url here as long as it's the only line on the output page.
+# Also the ip address must be the last thing on that line.
+WAN_IP_URL='http://smxi.org/opt/ip.php'
 KONVI_CFG="konversation/scripts/$SCRIPT_NAME.conf" # relative path to $(kde-config --path data)
 
-### Script Localization
-# Make sure every program speaks English.
-LC_ALL="C"
-export LC_ALL
+### INITIALIZE VARIABLES NULL ###
+BSD_TYPE=''
+BSD_VERSION=
+CMDL_MAX=''
+
+DEV_DISK_ID=''
+DEV_DISK_LABEL=''
+DEV_DISK_MAPPER=''
+DEV_DISK_UUID=''
+DMIDECODE_DATA=''
+IRC_CLIENT=''
+IRC_CLIENT_VERSION=''
+PS_THROTTLED=''
+REPO_DATA=''
+
+### LAYOUT ###
+# These two determine separators in single line output, to force irc clients not to break off sections
+SEP1='~'
+SEP2=' '
+# these will assign a separator to non irc states. Important! Using ':' can trigger stupid emoticon
+# behaviors in output on IRC, so do not use those.
+SEP3_IRC=''
+SEP3_CONSOLE=':'
+SEP3='' # do not set, will be set dynamically
+
+# Default indentation level. NOTE: actual indent is 1 greater to allow for spacing
+INDENT=10
 
-### Output Colors
+### COLUMN WIDTHS ###
+COLS_INNER='' ## for width minus INDENT
+COLS_MAX=''
+
+TERM_COLUMNS=80
+TERM_LINES=100
+
+# http://stackoverflow.com/questions/1780483/lines-and-columns-environmental-variables-lost-in-a-script
+if [[ -n $( type -p tput ) ]];then
+	TERM_COLUMNS=$(tput cols)
+	TERM_LINES=$(tput lines)
+fi
+# double check, just in case it's missing functionality or whatever
+if [[ -n ${TERM_COLUMNS##[0-9]*} ]];then
+	TERM_COLUMNS=80
+	TERM_LINES=100
+fi
+
+# Only for legacy user config files se we can test and convert the var name
+LINE_MAX_CONSOLE=''
+LINE_MAX_IRC=''
+
+### COLORS ###
+# Defaults to 2, make this 1 for normal, 0 for no colorcodes at all. Use following variables in config 
+# files to change defaults for each type, or global
+# Same as runtime parameter.
+DEFAULT_COLOR_SCHEME=2
+## color variables - set dynamically
+COLOR_SCHEME=''
+C1=''
+C2=''
+CN=''
+## Always leave these blank, these are only going to be set in inxi.conf files, that makes testing
+## for user changes easier after sourcing the files
+GLOBAL_COLOR_SCHEME=''
+IRC_COLOR_SCHEME=''
+IRC_CONS_COLOR_SCHEME=''
+IRC_X_TERM_COLOR_SCHEME=''
+CONSOLE_COLOR_SCHEME=''
+VIRT_TERM_COLOR_SCHEME=''
+
+## Output colors
 # A more elegant way to have a scheme that doesn't print color codes (neither ANSI nor mIRC) at all. See below.
 unset EMPTY
-#              DGREY    BLACK    RED      DRED     GREEN    DGREEN   YELLOW   DYELLOW
+#             DGREY   BLACK   RED     DRED    GREEN   DGREEN  YELLOW  DYELLOW
 ANSI_COLORS="       "
-IRC_COLORS="   \x0314   \x0301   \x0304   \x0305   \x0309   \x0303   \x0308   \x0307"
-#                            BLUE     DBLUE    MAGENTA  DMAGENTA CYAN     DCYAN    WHITE    GREY     NORMAL
+IRC_COLORS="  \x0314  \x0301  \x0304  \x0305  \x0309  \x0303  \x0308  \x0307"
+#                          BLUE    DBLUE   MAGENTA DMAGENTA CYAN   DCYAN   WHITE   GREY    NORMAL
 ANSI_COLORS="$ANSI_COLORS         "
-IRC_COLORS=" $IRC_COLORS    \x0312   \x0302   \x0313   \x0306   \x0311   \x0310   \x0300   \x0315   \x03"
+IRC_COLORS=" $IRC_COLORS    \x0312 \x0302  \x0313  \x0306  \x0311  \x0310  \x0300  \x0315  \x03"
 
 #ANSI_COLORS=($ANSI_COLORS); IRC_COLORS=($IRC_COLORS)
 A_COLORS_AVAILABLE=( DGREY BLACK RED DRED GREEN DGREEN YELLOW DYELLOW BLUE DBLUE MAGENTA DMAGENTA CYAN DCYAN WHITE GREY NORMAL )
+
 # See above for notes on EMPTY
-A_COLOR_SCHEMES=( EMPTY,EMPTY,EMPTY NORMAL,NORMAL,NORMAL BLUE,NORMAL,NORMAL GREEN,YELLOW,NORMAL DYELLOW,NORMAL,NORMAL CYAN,BLUE,NORMAL RED,NORMAL,NORMAL GREEN,NORMAL,NORMAL YELLOW,NORMAL,NORMAL GREEN,DGREEN,NORMAL BLUE,RED,NORMAL BLUE,NORMAL,RED YELLOW,WHITE,GREEN BLUE,NORMAL,GREEN DCYAN,NORMAL,DMAGENTA )
-## Actual color variables
-C1=''
-C2=''
-CN=''
+## note: group 1: 0, 1 are null/normal
+## Following: group 2: generic, light/dark or dark/light; group 3: dark on light; group 4 light on dark; 
+# this is the count of the first two groups, starting at zero
+SAFE_COLOR_COUNT=12
+A_COLOR_SCHEMES=( 
+EMPTY,EMPTY,EMPTY 
+NORMAL,NORMAL,NORMAL 
+
+BLUE,NORMAL,NORMAL
+BLUE,RED,NORMAL 
+CYAN,BLUE,NORMAL 
+DCYAN,NORMAL,NORMAL
+DCYAN,BLUE,NORMAL 
+DGREEN,NORMAL,NORMAL 
+DYELLOW,NORMAL,NORMAL 
+GREEN,DGREEN,NORMAL 
+GREEN,NORMAL,NORMAL 
+MAGENTA,NORMAL,NORMAL
+RED,NORMAL,NORMAL
+
+BLACK,DGREY,NORMAL
+DBLUE,DGREY,NORMAL 
+DBLUE,DMAGENTA,NORMAL
+DBLUE,DRED,NORMAL 
+DBLUE,BLACK,NORMAL
+DGREEN,DYELLOW,NORMAL 
+DYELLOW,BLACK,NORMAL
+DMAGENTA,BLACK,NORMAL
+DCYAN,DBLUE,NORMAL
+
+WHITE,GREY,NORMAL
+GREY,WHITE,NORMAL
+CYAN,GREY,NORMAL 
+GREEN,WHITE,NORMAL 
+GREEN,YELLOW,NORMAL 
+YELLOW,WHITE,NORMAL 
+MAGENTA,CYAN,NORMAL 
+MAGENTA,YELLOW,NORMAL
+RED,CYAN,NORMAL
+RED,WHITE,NORMAL 
+BLUE,WHITE,NORMAL
+)
+
+# WARNING: In the main part below (search for 'KONVI')
+# there's a check for Konversation-specific config files.
+# Any one of these can override the above if inxi is run
+# from Konversation!
 
-### Distro Data
+## DISTRO DATA/ID ##
 # In cases of derived distros where the version file of the base distro can also be found under /etc,
 # the derived distro's version file should go first. (Such as with Sabayon / Gentoo)
-DISTROS_DERIVED="antix-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release sidux-version turbolinux-release zenwalk-version"
+DISTROS_DERIVED="antix-version aptosid-version kanotix-version knoppix-version mandrake-release pardus-release sabayon-release siduction-version sidux-version solusos-release turbolinux-release zenwalk-version"
 # debian_version excluded from DISTROS_PRIMARY so Debian can fall through to /etc/issue detection. Same goes for Ubuntu.
 DISTROS_EXCLUDE_LIST="debian_version ubuntu_version"
-DISTROS_PRIMARY="gentoo-release redhat-release slackware-version SuSE-release"
+DISTROS_PRIMARY="arch-release gentoo-release redhat-release slackware-version SuSE-release"
 DISTROS_LSB_GOOD="mandrake-release mandriva-release mandrakelinux-release"
+# this is being used both by core distros and derived distros now, eg, solusos 1 uses it for solusos id, while
+# debian, solusos base, uses it as well, so we have to know which it is.
+DISTROS_OS_RELEASE_GOOD="arch-release SuSE-release"
 ## Distros with known problems
 # DSL (Bash 2.05b: grep -m doesn't work; arrays won't work) --> unusable output
 # Puppy Linux 4.1.2 (Bash 3.0: arrays won't work) --> works partially
 
-### Bans Data
-# Precede a banword with $'\2' to prevent it from being subject to automated escaping by the make_ban_lists routine
-# $'\1' gets weird results :
-# user@host $ ARR=($'\x01'"one two" three four); echo ${ARR[0]} | hd -v
-# 00000000  01 01 6f 6e 65 20 74 77  6f 0a                    |..one two.|
-A_NORMAL_BANS=( corporation communications gmbh technologies technology group $'\2'"\<ltd\>" ltd. $'\2'"\<inc\>" inc. $'\2'\<co\> co. "(tm)" "(r)" "®" $'\2'"\(rev ..\)" )
-A_CPU_BANS=( @ cpu deca 'dual core' dual-core 'tri core' tri-core 'quad core' quad-core ennea genuine hepta hexa multi octa penta 'processor' processor single triple $'\2'"[0-9.]+ *[MmGg][Hh][Zz]" )
-# after processing, the ban arrays will be put into these:
-BAN_LIST_NORMAL=''
-BAN_LIST_CPU=''
+## OUTPUT FILTERS/SEARCH ##
+# Note that \<ltd\> bans only words, not parts of strings; in \<corp\> you can't use punctuation characters like . or ,
+# we're saving about 10+% of the total script exec time by hand building the ban lists here, using hard quotes.
+BAN_LIST_NORMAL='chipset|components|computing|computer|corporation|communications|electronics|electrical|electric|gmbh|group|industrial|international|revision|semiconductor|software|technologies|technology|ltd\.|\<ltd\>|inc\.|\<inc\>|intl\.|co\.|\<co\>|corp\.|\<corp\>|\(tm\)|\(r\)|®|\(rev ..\)'
+BAN_LIST_CPU='@|cpu deca|dual core|dual-core|tri core|tri-core|quad core|quad-core|ennea|genuine|hepta|hexa|multi|octa|penta|processor|single|triple|[0-9\.]+ *[MmGg][Hh][Zz]'
 
-# WARNING: In the main part below (search for 'KONVI')
-# there's a check for Konversation-specific config files.
-# Any one of these can override the above if inxi is run
-# from Konversation!
+SENSORS_GPU_SEARCH='intel|radeon|nouveau'
+
+### 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
+USB_NETWORK_SEARCH="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"
+USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|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|54 Mbps" 
+# then a few known hard to ID ones added 
+# belkin=050d; d-link=07d1; netgear=0846; ralink=148f; realtek=0bda; 
+USB_NETWORK_SEARCH="$USB_NETWORK_SEARCH|050d:935b|0bda:8189|0bda:8197"
 
 ########################################################################
 #### MAIN: Where it all begins
@@ -411,51 +629,75 @@ main()
 {
 	eval $LOGFS
 	
-	# This function just initializes variables
-	initialize_script_data
-
-	# Check for dependencies BEFORE running ANYTHING else except above functions
-	# Not all distro's have these depends installed by default
-	check_script_depends
-	check_script_suggested_apps
-	
-	# note: this needs to go AFTER depends check because these use gawk
-	# Do this after sourcing of config overrides so user can customize banwords
-	# Contrary to my previous belief, "${ARR[@]}" passes a quoted list, not one string
-	BAN_LIST_NORMAL=$( make_ban_lists "${A_NORMAL_BANS[@]}" ) 
-	BAN_LIST_CPU=$( make_ban_lists "${A_CPU_BANS[@]}" )
-	##echo "BAN_LIST_NORMAL='$BAN_LIST_NORMAL'"
+	local color_scheme=''
+	# this will be used by all functions following
+	local Ps_aux_Data="$( ps aux )"
 
-	# first init function must be set first for colors etc. Remember, no debugger
-	# stuff works on this function unless you set the debugging flag manually.
-	# Debugging flag -@ [number] will not work until get_parameters runs.
-	
-	### Only continue if depends ok
-	SCRIPT_PATH=$( dirname $0 )
-	SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+	# This function just initializes variables
+	initialize_data
 	
-	### Source global config overrides
+	# Source global config overrides, needs to be here because some things
+	# can be reset that were set in initialize, but check_required_apps needs
 	if [[ -s /etc/$SCRIPT_NAME.conf ]];then
 		source /etc/$SCRIPT_NAME.conf
 	fi
-	# Source user config overrides, ~/.inxi/inxi.conf
+	# Source user config variables override /etc/inxi.conf variables
 	if [[ -s $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf ]];then
 		source $HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf
 	fi
+	# Convert to new variable names if set in config files, legacy test
+	if [[ -n $LINE_MAX_CONSOLE ]];then
+		COLS_MAX_CONSOLE=$LINE_MAX_CONSOLE
+	fi
+	if [[ -n $LINE_MAX_IRC ]];then
+		COLS_MAX_IRC=$LINE_MAX_IRC
+	fi
+	# TERM_COLUMNS is set in top globals, using tput cols
+	if [[ $TERM_COLUMNS -lt $COLS_MAX_CONSOLE ]];then
+		COLS_MAX_CONSOLE=$TERM_COLUMNS
+	fi
+	# adjust, some terminals will wrap if output cols == term cols
+	COLS_MAX_CONSOLE=$(( $COLS_MAX_CONSOLE - 2 ))
+	
+	# comes after source for user set stuff
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		COLS_MAX=$COLS_MAX_CONSOLE
+		SEP3=$SEP3_CONSOLE
+	else
+		# too hard to read if no colors, so force that for users on irc
+		if [[ $SCHEME == 0 ]];then
+			SEP3=$SEP3_CONSOLE
+		else
+			SEP3=$SEP3_IRC
+		fi
+		COLS_MAX=$COLS_MAX_IRC
+	fi
+	COLS_INNER=$(( $COLS_MAX - $INDENT - 4 ))
+
+	# Check for dependencies BEFORE running ANYTHING else except above functions
+	# Not all distro's have these depends installed by default. Don't want to run
+	# this if the user is requesting to see this information in the first place
+	# Only continue if required apps tests ok
+	if [[ $1 != '--recommends' ]];then
+		check_required_apps
+		check_recommended_apps
+	fi
+
+	SCRIPT_VERSION_NUMBER=$( parse_version_data 'main' )
+	SCRIPT_PATCH_NUMBER=$( parse_version_data 'patch' )
+	
+	# previous source location, check for bugs
 
 	## this needs to run before the KONVI stuff is set below
 	## Konversation 1.2 apparently does not like the $PPID test in get_start_client
 	## So far there is no known way to detect if qt4_konvi is the parent process
 	## this method will infer qt4_konvi as parent
-	
 	get_start_client
 
 	# note: this only works if it's run from inside konversation as a script builtin or something
 	# only do this if inxi has been started as a konversation script, otherwise bypass this	
 #	KONVI=3 ## for testing puroses
-	## 
 	if [[ $KONVI -eq 1 || $KONVI -eq 3 ]];then
-		
 		if [[ $KONVI -eq 1 ]]; then ## dcop Konversation (ie 1.x < 1.2(qt3))	
 			DCPORT="$1"
 			DCSERVER="$2"
@@ -484,16 +726,47 @@ main()
 	# 	print_screen_output "DCPORT: $DCPORT"
 	# 	print_screen_output "DCSERVER: $DCSERVER"
 	# 	print_screen_output "DCTARGET: $DCTARGET"
-
+	
+	# first init function must be set first for colors etc. Remember, no debugger
+	# stuff works on this function unless you set the debugging flag manually.
+	# Debugging flag -@ [number] will not work until get_parameters runs.
+	
 	# "$@" passes every parameter separately quoted, "$*" passes all parameters as one quoted parameter.
 	# must be here to allow debugger and other flags to be set.
 	get_parameters "$@"
 
 	# If no colorscheme was set in the parameter handling routine, then set the default scheme
-	if [[ $COLOR_SCHEME_SET != 'true' ]];then
-		set_color_scheme "$DEFAULT_SCHEME"
+	if [[ $B_COLOR_SCHEME_SET != 'true' ]];then
+		# 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 [[ $B_RUN_COLOR_SELECTOR == 'true' ]];then 
+			select_default_color_scheme
+		else
+			# set the default, then override as required
+			color_scheme=$DEFAULT_COLOR_SCHEME
+			if [[ -n $GLOBAL_COLOR_SCHEME ]];then
+				color_scheme=$GLOBAL_COLOR_SCHEME
+			else
+				if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+					if [[ -n $CONSOLE_COLOR_SCHEME && -z $DISPLAY ]];then
+						color_scheme=$CONSOLE_COLOR_SCHEME
+					elif [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
+						color_scheme=$VIRT_TERM_COLOR_SCHEME
+					fi
+				else
+					if [[ -n $IRC_X_TERM_COLOR_SCHEME && $B_CONSOLE_IRC == 'true' && -n $B_RUNNING_IN_DISPLAY ]];then
+						color_scheme=$IRC_X_TERM_COLOR_SCHEME
+					elif [[ -n $IRC_CONS_COLOR_SCHEME && -z $DISPLAY ]];then
+						color_scheme=$IRC_CONS_COLOR_SCHEME
+					elif [[ -n $IRC_COLOR_SCHEME ]];then
+						color_scheme=$IRC_COLOR_SCHEME
+					fi
+				fi
+			fi
+			set_color_scheme $color_scheme
+		fi
 	fi
-
+	
 	# all the pre-start stuff is in place now
 	B_SCRIPT_UP='true'
 	script_debugger "Debugger: $SCRIPT_NAME is up and running..."
@@ -512,7 +785,7 @@ main()
 }
 
 #### -------------------------------------------------------------------
-#### basic tests: set script data, booleans, PATH
+#### basic tests: set script data, booleans, PATH, version numbers
 #### -------------------------------------------------------------------
 
 # Set PATH data so we can access all programs as user. Set BAN lists.
@@ -520,42 +793,47 @@ main()
 # some apps are used for extended functions any directory used, should be
 # checked here first.
 # No args taken.
-initialize_script_data()
+initialize_data()
 {
 	eval $LOGFS
-	local path='' sys_path='' added_path='' b_path_found=''
-	# Extra path variable to make execute failures less likely, merged below
-	local extra_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
-
-	# Fallback paths put into $extra_paths; This might, among others, help on gentoo.
-	# Now, create a difference of $PATH and $extra_paths and add that to $PATH:
-	IFS=":"
-	for path in $extra_paths
-	do
-		b_path_found='false'
-		for sys_path in $PATH
-		do
-			if [[ $path == $sys_path ]];then
-				b_path_found='true'
-			fi
-		done
-		if [[ $b_path_found == 'false' ]];then
-			added_path="$added_path:$path"
+	BSD_VERSION=$( uname -s 2>/dev/null | tr '[A-Z]' '[a-z]' )
+	
+	# note: archbsd says they are a freebsd distro, so assuming it's the same as freebsd
+	if [[ -n $( grep 'bsd' <<< "$BSD_VERSION" ) ]];then
+		# GNU/kfreebsd will by definition have GNU tools like sed/grep
+		if [[ -n $( grep 'kfreebsd' <<< "$BSD_VERSION" ) ]];then
+			BSD_TYPE='debian-bsd' # debian gnu bsd
+		else
+			BSD_TYPE='bsd' # all other bsds
+			SED_I="-i ''"
+			SED_RX='-E'
 		fi
-	done
-
-	IFS="$ORIGINAL_IFS"
-	PATH="${PATH}${added_path}"
-	##echo "PATH='$PATH'"
-	##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
-
+	fi
 	# now set the script BOOLEANS for files required to run features
-	if [[ -d "/proc/" ]];then
+	# note that freebsd has /proc but it's empty
+	if [[ -d "/proc/" && -z $BSD_TYPE ]];then
 		B_PROC_DIR='true'
+	elif [[ -n $BSD_TYPE ]];then
+		B_PROC_DIR='false'
 	else
 		error_handler 6
 	fi
-
+	
+	initialize_paths
+	
+	if [[ -n $BSD_TYPE ]];then
+		if [[ -e $FILE_DMESG_BOOT ]];then
+			B_DMESG_BOOT_FILE='true'
+		fi
+	else
+		# found a case of battery existing but having nothing in it on desktop mobo
+		# not all laptops show the first, 
+		if [[ -n $( ls /proc/acpi/battery 2>/dev/null ) ]];then
+			B_PORTABLE='true'
+		fi
+	fi
+	
+	
 	if [[ -e $FILE_CPUINFO ]]; then
 		B_CPUINFO_FILE='true'
 	fi
@@ -575,13 +853,22 @@ initialize_script_data()
 	if [[ -f $FILE_LSB_RELEASE ]];then
 		B_LSB_FILE='true'
 	fi
+	
+	if [[ -f $FILE_OS_RELEASE ]];then
+		B_OS_RELEASE_FILE='true'
+	fi
 
 	if [[ -e $FILE_SCSI ]];then
 		B_SCSI_FILE='true'
 	fi
 
 	if [[ -n $DISPLAY ]];then
-		B_X_RUNNING='true'
+		B_SHOW_DISPLAY_DATA='true'
+		B_RUNNING_IN_DISPLAY='true'
+	fi
+	
+	if [[ -e $FILE_MDSTAT ]];then
+		B_MDSTAT_FILE='true'
 	fi
 
 	if [[ -e $FILE_MODULES ]];then
@@ -595,6 +882,18 @@ initialize_script_data()
 	if [[ -e $FILE_PARTITIONS ]];then
 		B_PARTITIONS_FILE='true'
 	fi
+	# default to the normal location, then search for it
+	if [[ -e $FILE_XORG_LOG ]];then
+		B_XORG_LOG='true'
+	else
+		# Detect location of the Xorg log file
+		if [[ -n $( type -p xset ) ]]; then
+			FILE_XORG_LOG=$( xset q 2>/dev/null | grep -i 'Log file' | gawk '{print $3}')
+			if [[ -e $FILE_XORG_LOG ]];then
+				B_XORG_LOG='true'
+			fi
+		fi
+	fi
 	# gfx output will require this flag
 	if [[ $( whoami ) == 'root' ]];then
 		B_ROOT='true'
@@ -602,8 +901,69 @@ initialize_script_data()
 	eval $LOGFE
 }
 
+# arg: $1 - version number: main/patch/date
+parse_version_data()
+{
+	local version_data=''
+
+	# note, using ####[[:space:]]+ to avoid having this function also trip the version datas
+	case $1 in
+		date)
+			version_data="$( gawk -F ': ' '
+			/####[[:space:]]+Date:/ {
+				print $NF
+			}' $SCRIPT_PATH/$SCRIPT_NAME )"
+			;;
+		main)
+			version_data="$( gawk '
+			/####[[:space:]]+Version:/ {
+				print $3
+			}' $SCRIPT_PATH/$SCRIPT_NAME )"
+			;;
+		patch)
+			version_data="$( gawk '
+			/####[[:space:]]+Patch Number:/ {
+				print $4
+			}' $SCRIPT_PATH/$SCRIPT_NAME )"
+			;;
+	esac
+	echo $version_data
+}
+
+initialize_paths()
+{
+	local path='' added_path='' b_path_found='' sys_path=''
+	# Extra path variable to make execute failures less likely, merged below
+	local extra_paths="/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+	
+	# this needs to be set here because various options call the parent initialize function directly.
+	SCRIPT_PATH=$( dirname $0 )
+
+	# Fallback paths put into $extra_paths; This might, among others, help on gentoo.
+	# Now, create a difference of $PATH and $extra_paths and add that to $PATH:
+	IFS=":"
+	for path in $extra_paths
+	do
+		b_path_found='false'
+		for sys_path in $PATH
+		do
+			if [[ $path == $sys_path ]];then
+				b_path_found='true'
+			fi
+		done
+		if [[ $b_path_found == 'false' ]];then
+			added_path="$added_path:$path"
+		fi
+	done
+
+	IFS="$ORIGINAL_IFS"
+	PATH="${PATH}${added_path}"
+	##echo "PATH='$PATH'"
+	##/bin/sh -c 'echo "PATH in subshell=\"$PATH\""'
+}
+
 # No args taken.
-check_script_suggested_apps()
+check_recommended_apps()
 {
 	eval $LOGFS
 	local bash_array_test=( "one" "two" )
@@ -619,26 +979,56 @@ check_script_suggested_apps()
 	else
 		script_debugger "Suggestion: update to Bash v3.1 for optimal inxi output"
 	fi
-	eval $LOGFE
-}
-
-# Determine if any of the absolutely necessary tools are absent
-# No args taken.
-check_script_depends()
+	# test for a few apps that bsds may not have after initial tests
+	if [[ -n $( type -p lspci ) ]];then
+		B_LSPCI='true'
+	fi
+	if [[ -n $BSD_TYPE ]];then
+		if [[ -n $( type -p sysctl ) ]];then
+			B_SYSCTL='true'
+		fi
+		if [[ -n $( type -p pciconf ) ]];then
+			B_PCICONF='true'
+		fi
+	fi
+	# now setting qdbus/dcop for first run, some systems can have both by the way
+	if [[ -n $( type -p qdbus ) ]];then
+		B_QDBUS='true'
+	fi
+	if [[ -n $( type -p dcop ) ]];then
+		B_DCOP='true'
+	fi
+	eval $LOGFE
+}
+
+# Determine if any of the absolutely necessary tools are absent
+# No args taken.
+check_required_apps()
 {
 	eval $LOGFS
 	local app_name='' app_path=''
 	# bc removed from deps for now
-	local depends="df free gawk grep hostname lspci ps readlink tr uname uptime wc"
-	local x_apps="xrandr xdpyinfo glxinfo"
-
-	if [[ $B_X_RUNNING == 'true' ]];then
+	local depends="df gawk grep ps readlink tr uname uptime wc"
+	
+	if [[ -z $BSD_TYPE  ]];then
+		depends="$depends lspci"
+	elif [[ $BSD_TYPE == 'bsd' ]];then
+		depends="$depends sysctl"
+		# debian-bsd has lspci but you must be root to run it
+	elif [[ $BSD_TYPE == 'debian-bsd' ]];then
+		depends="$depends sysctl lspci"
+	fi
+	# no need to add xprop because it will just give N/A if not there, but if we expand use of xprop,
+	# should add that here as a test, then use the B_SHOW_DISPLAY_DATA flag to trigger the tests in de function
+	local x_apps="xrandr xdpyinfo glxinfo" 
+
+	if [[ $B_RUNNING_IN_DISPLAY == 'true' ]];then
 		for app_name in $x_apps
 		do
 			app_path=$( type -p $app_name )
 			if [[ -z $app_path ]];then
-				script_debugger "Resuming in non X mode: $app_name not found in path"
-				B_X_RUNNING='false'
+				script_debugger "Resuming in non X mode: $app_name not found. For package install advice run: $SCRIPT_NAME --recommends"
+				B_SHOW_DISPLAY_DATA='false'
 				break
 			fi
 		done
@@ -680,40 +1070,12 @@ sanitize_characters()
 	eval $LOGFE
 }
 
-# Filter boilerplate & buzzwords.
-# args: $1 - quoted: "$@" array of ban terms
-make_ban_lists()
-{
-	eval $LOGFS
-	local ban_list=''
-	# Iterate over $@
-	## note: this is a weird, non-intuitive method, needs some documentation or rewriting
-	## if you declare ban_string it stops working, have to read up on this
-	for ban_string
-	do
-		# echo "term=\"$ban_string\"" # >&2
-		if [[ ${ban_string:0:1} = $'\2' ]];then
-			ban_list="${ban_list}${ban_list+|}${ban_string:1:${#ban_string}-1}"
-		else
-			# Automatically escapes [ ] ( ) . and +
-			ban_list="${ban_list}${ban_list+|}$( echo "$ban_string" | gawk '{
-				gsub(/([\[\]+().])/,"\\\\&")
-				print
-			}' )"
-		fi
-	done
-
-	echo "$ban_list"
-	eval $LOGFS
-}
-# make_ban_lists "${A_CPU_BANS[@]}";exit
-
 # Set the colorscheme
 # args: $1 = <scheme number>|<"none">
 set_color_scheme()
 {
 	eval $LOGFS
-	local i='' script_colors='' color_codes=''
+	local i='' a_output_colors='' a_color_codes=''
 
 	if [[ $1 -ge ${#A_COLOR_SCHEMES[@]} ]];then
 		set -- 1
@@ -721,25 +1083,184 @@ set_color_scheme()
 	# Set a global variable to allow checking for chosen scheme later
 	SCHEME="$1"
 	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
-		color_codes=( $ANSI_COLORS )
+		a_color_codes=( $ANSI_COLORS )
 	else
-		color_codes=( $IRC_COLORS )
+		a_color_codes=( $IRC_COLORS )
 	fi
 	for (( i=0; i < ${#A_COLORS_AVAILABLE[@]}; i++ ))
 	do
-		eval "${A_COLORS_AVAILABLE[i]}=\"${color_codes[i]}\""
+		eval "${A_COLORS_AVAILABLE[i]}=\"${a_color_codes[i]}\""
 	done
 	IFS=","
-	script_colors=( ${A_COLOR_SCHEMES[$1]} )
+	a_output_colors=( ${A_COLOR_SCHEMES[$1]} )
 	IFS="$ORIGINAL_IFS"
 	# then assign the colors globally
-	C1="${!script_colors[0]}"
-	C2="${!script_colors[1]}"
-	CN="${!script_colors[2]}"
+	C1="${!a_output_colors[0]}"
+	C2="${!a_output_colors[1]}"
+	CN="${!a_output_colors[2]}"
 	# ((COLOR_SCHEME++)) ## note: why is this? ##
 	eval $LOGFE
 }
 
+select_default_color_scheme()
+{
+	eval $LOGFS
+	local spacer='  ' options='' user_selection='' config_variable=''
+	local config_file="$HOME/.$SCRIPT_NAME/$SCRIPT_NAME.conf"
+	local irc_clear="" 
+	local irc_gui='Unset' irc_console='Unset' irc_x_term='Unset'
+	local console='Unset' virt_term='Unset' global='Unset' 
+	
+	if [[ -n $IRC_COLOR_SCHEME ]];then
+		irc_gui="Set: $IRC_COLOR_SCHEME"
+	fi
+	if [[ -n $IRC_CONS_COLOR_SCHEME ]];then
+		irc_console="Set: $IRC_CONS_COLOR_SCHEME"
+	fi
+	if [[ -n $IRC_X_TERM_COLOR_SCHEME ]];then
+		irc_x_term="Set: $IRC_X_TERM_COLOR_SCHEME"
+	fi
+	if [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
+		virt_term="Set: $VIRT_TERM_COLOR_SCHEME"
+	fi
+	if [[ -n $CONSOLE_COLOR_SCHEME ]];then
+		console="Set: $CONSOLE_COLOR_SCHEME"
+	fi
+	if [[ -n $GLOBAL_COLOR_SCHEME ]];then
+		global="Set: $GLOBAL_COLOR_SCHEME"
+	fi
+	
+	# don't want these printing in irc since they show literally
+	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
+		irc_clear=''
+	fi
+	# first make output neutral so it's just plain default for console client
+	set_color_scheme "0"
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		print_screen_output "Welcome to $SCRIPT_NAME! Please select the default $COLOR_SELECTION color scheme."
+		# print_screen_output "You will see this message only one time per user account, unless you set preferences in: /etc/$SCRIPT_NAME.conf"
+		print_screen_output " "
+	fi
+	print_screen_output "Because there is no way to know your $COLOR_SELECTION foreground/background colors, you can"
+	print_screen_output "set your color preferences from color scheme option list below. 0 is no colors, 1 neutral."
+	print_screen_output "After these, there are 3 sets: 1-dark or light backgrounds; 2-light backgrounds; 3-dark backgrounds."
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		print_screen_output "Please note that this will set the $COLOR_SELECTION preferences only for user: $(whoami)"
+	fi
+	print_screen_output "------------------------------------------------------------------------------"
+	for (( i=0; i < ${#A_COLOR_SCHEMES[@]}; i++ ))
+	do
+		if [[ $i -gt 9 ]];then
+			spacer=' '
+		fi
+		# only offer the safe universal defaults
+		case $COLOR_SELECTION in
+			global|irc|irc-console|irc-virtual-terminal)
+				if [[ $i -gt $SAFE_COLOR_COUNT ]];then
+					break
+				fi
+				;;
+		esac
+		set_color_scheme $i
+		print_screen_output "$irc_clear $i)$spacer${C1}Card:${C2} nVidia G86 [GeForce 8400 GS] ${C1}X.Org${C2} 1.7.7"
+	done
+	set_color_scheme 0
+	
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		echo -n ""
+		print_screen_output "$irc_clear $i)${spacer}Remove all color settings. Restore $SCRIPT_NAME default."
+		print_screen_output "$irc_clear $(($i+1)))${spacer}Continue, no changes or config file setting."
+		print_screen_output "$irc_clear $(($i+2)))${spacer}Exit, use another terminal, or set manually."
+		print_screen_output "------------------------------------------------------------------------------"
+		print_screen_output "Simply type the number for the color scheme that looks best to your eyes for your $COLOR_SELECTION settings"
+		print_screen_output "and hit ENTER. NOTE: You can bring this option list up by starting $SCRIPT_NAME with option: -c plus one of these numbers:"
+		print_screen_output "94 (console, no X - $console); 95 (terminal, X - $virt_term); 96 (irc, gui, X - $irc_gui);"
+		print_screen_output "97 (irc, X, in terminal - $irc_x_term); 98 (irc, no X - $irc_console); 99 (global - $global)"
+		print_screen_output "Your selection(s) will be stored here: $config_file"
+		print_screen_output "Global overrides all individual color schemes. Individual schemes remove the global setting."
+		print_screen_output "------------------------------------------------------------------------------"
+		read user_selection
+		if [[ -n $( grep -Es '^([0-9]+)$' <<< "$user_selection" ) && $user_selection -lt $i ]];then
+			case $COLOR_SELECTION in
+				irc)
+					config_variable='IRC_COLOR_SCHEME'
+					;;
+				irc-console)
+					config_variable='IRC_CONS_COLOR_SCHEME'
+					;;
+				irc-virtual-terminal)
+					config_variable='IRC_X_TERM_COLOR_SCHEME'
+					;;
+				console)
+					config_variable='CONSOLE_COLOR_SCHEME'
+					;;
+				virtual-terminal)
+					config_variable='VIRT_TERM_COLOR_SCHEME'
+					;;
+				global)
+					config_variable='GLOBAL_COLOR_SCHEME'
+					;;
+			esac
+			set_color_scheme $user_selection
+			# make file/directory first if missing
+			if [[ ! -f $config_file ]];then
+				if [[ ! -d $HOME/.$SCRIPT_NAME ]];then
+					mkdir $HOME/.$SCRIPT_NAME
+				fi
+				touch $config_file
+			fi
+			if [[ -z $( grep -s "$config_variable=" $config_file ) ]];then
+				print_screen_output "Creating and updating config file for $COLOR_SELECTION color scheme now..."
+				echo "$config_variable=$user_selection" >> $config_file
+			else
+				print_screen_output "Updating config file for $COLOR_SELECTION color scheme now..."
+				sed $SED_I "s/$config_variable=.*/$config_variable=$user_selection/" $config_file
+			fi
+			# file exists now so we can go on to cleanup
+			case $COLOR_SELECTION in
+				irc|irc-console|irc-virtual-terminal|console|virtual-terminal)
+					sed $SED_I '/GLOBAL_COLOR_SCHEME=/d' $config_file
+					;;
+				global)
+					sed $SED_I -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' -e '/IRC_COLOR_SCHEME=/d' \
+					-e '/IRC_CONS_COLOR_SCHEME=/d' -e '/IRC_X_TERM_COLOR_SCHEME=/d' $config_file
+					;;
+			esac
+		elif [[ $user_selection == $i ]];then
+			print_screen_output "Removing all color settings from config file now..."
+			sed $SED_I -e '/VIRT_TERM_COLOR_SCHEME=/d' -e '/GLOBAL_COLOR_SCHEME=/d' -e '/CONSOLE_COLOR_SCHEME=/d' \
+			-e '/IRC_COLOR_SCHEME=/d' -e '/IRC_CONS_COLOR_SCHEME=/d' -e '/IRC_X_TERM_COLOR_SCHEME=/d' $config_file
+			set_color_scheme $DEFAULT_COLOR_SCHEME
+		elif [[ $user_selection == $(( $i+1 )) ]];then
+			print_screen_output "Ok, continuing $SCRIPT_NAME unchanged. You can set the colors anytime by starting with: -c 95 to 99"
+			if [[ -n $CONSOLE_COLOR_SCHEME && -z $DISPLAY ]];then
+				set_color_scheme $CONSOLE_COLOR_SCHEME
+			elif [[ -n $VIRT_TERM_COLOR_SCHEME ]];then
+				set_color_scheme $VIRT_TERM_COLOR_SCHEME
+			else
+				set_color_scheme $DEFAULT_COLOR_SCHEME
+			fi
+		elif [[ $user_selection == $(( $i+2 )) ]];then
+			set_color_scheme $DEFAULT_COLOR_SCHEME
+			print_screen_output "Ok, exiting $SCRIPT_NAME now. You can set the colors later."
+			exit 0
+		else
+			print_screen_output "Error - Invalid Selection. You entered this: $user_selection"
+			print_screen_output " "
+			select_default_color_scheme
+		fi
+	else
+		print_screen_output "------------------------------------------------------------------------------"
+		print_screen_output "After finding the scheme number you like, simply run this again in a terminal to set the configuration"
+		print_screen_output "data file for your irc client. You can set color schemes for the following: start inxi with -c plus:"
+		print_screen_output "94 (console, no X - $console); 95 (terminal, X - $virt_term); 96 (irc, gui, X - $irc_gui);"
+		print_screen_output "97 (irc, X, in terminal - $irc_x_term); 98 (irc, no X - $irc_console); 99 (global - $global)"
+		exit 0
+	fi
+
+	eval $LOGFE
+}
+
 ########################################################################
 #### UTILITY FUNCTIONS
 ########################################################################
@@ -749,7 +1270,7 @@ set_color_scheme()
 #### -------------------------------------------------------------------
 
 # Error handling
-# args: $1 - error number; $2 - optional, extra information
+# args: $1 - error number; $2 - optional, extra information; $3 - optional extra info
 error_handler()
 {
 	eval $LOGFS
@@ -763,7 +1284,7 @@ error_handler()
 			;;
 		4)	error_message="unsupported verbosity level: $2"
 			;;
-		5)	error_message="dependency not met: $2 not found in path"
+		5)	error_message="dependency not met: $2 not found in path.\nFor distribution installation package names and missing apps information, run: $SCRIPT_NAME --recommends"
 			;;
 		6)	error_message="/proc not found! Quitting..."
 			;;
@@ -785,6 +1306,27 @@ error_handler()
 		13)
 			error_message="The -t option requires the following extra arguments (no spaces between letters/numbers):\nc m cm [required], for example: -t cm8 OR -t cm OR -t c9\n(numbers: 1-20, > 5 throttled to 5 in irc clients) You entered: $2"
 			;;
+		14)
+			error_message="failed to write correctly downloaded $SCRIPT_NAME to location $SCRIPT_PATH.\nThis usually means you don't have permission to write to that location, maybe you need to be root?\nThe operation failed with error: $2"
+			;;
+		15)
+			error_message="failed set execute permissions on $SCRIPT_NAME at location $SCRIPT_PATH.\nThis usually means you don't have permission to set permissions on files there, maybe you need to be root?\nThe operation failed with error: $2"
+			;;
+		16)
+			error_message="$SCRIPT_NAME downloaded but the file data is corrupted. Purged data and using current version."
+			;;
+		17)
+			error_message="All $SCRIPT_NAME self updater features have been disabled by the distribution\npackage maintainer. This includes the option you used: $2"
+			;;
+		18)
+			error_message="The argument you provided for $2 does not have supported syntax.\nPlease use the following formatting:\n$3"
+			;;
+		19)
+			error_message="The option $2 has been deprecated. Please use $3 instead.\nSee -h for instructions and syntax."
+			;;
+		20)
+			error_message="The option you selected has been deprecated. $2\nSee the -h (help) menu for currently supported options."
+			;;
 		*)	error_message="error unknown: $@"
 			set -- 99
 			;;
@@ -871,7 +1413,7 @@ log_function_data()
 		# This pattern doesn't work for irc colors, if we need that someone can figure it out
 		if [[ -n $logged_data ]];then
 			if [[ $B_LOG_COLORS != 'true' ]];then
-				echo -e "${spacer}$logged_data" | sed -r 's/\x1b\[[0-9]{1,2}(;[0-9]{1,2}){0,2}m//g' >> $LOG_FILE
+				echo -e "${spacer}$logged_data" | sed $SED_RX 's/\x1b\[[0-9]{1,2}(;[0-9]{1,2}){0,2}m//g' >> $LOG_FILE
 			else
 				echo -e "${spacer}$logged_data" >> $LOG_FILE
 			fi
@@ -905,28 +1447,75 @@ create_rotate_logfiles()
 }
 
 # args: $1 - download url, not including file name; $2 - string to print out
+# $3 - update type option
 # note that $1 must end in / to properly construct the url path
 script_self_updater()
 {
 	eval $LOGFS
-	local wget_error=0
+	local wget_error=0 file_contents='' wget_man_error=0 
+	local man_file_path="$MAN_FILE_LOCATION/inxi.1.gz"
+	
+	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
+		print_screen_output "Sorry, you can't run the $SCRIPT_NAME self updater option (-$3) in an IRC client."
+		exit 1
+	fi
+
 	print_screen_output "Starting $SCRIPT_NAME self updater."
 	print_screen_output "Currently running $SCRIPT_NAME version number: $SCRIPT_VERSION_NUMBER"
+	print_screen_output "Current version patch number: $SCRIPT_PATCH_NUMBER"
 	print_screen_output "Updating $SCRIPT_NAME in $SCRIPT_PATH using $2 as download source..."
-	# first test if path is good, need to make sure it's good because we're -O overwriting file
-	wget -q --spider $1$SCRIPT_NAME || wget_error=$?
+
+	file_contents="$( wget -q -O - $1$SCRIPT_NAME )" || wget_error=$?
 	# then do the actual download
-	if [[ $wget_error -eq 0 ]];then
-		wget -q -O $SCRIPT_PATH/$SCRIPT_NAME $1$SCRIPT_NAME || wget_error=$?
-		if [[ $wget_error -eq 0 ]];then
-			SCRIPT_VERSION_NUMBER=$( grep -im 1 'version:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3}' )
+	if [[  $wget_error -eq 0 ]];then
+		# make sure the whole file got downloaded and is in the variable
+		if [[ -n $( grep '###\*\*EOF\*\*###' <<< "$file_contents" ) ]];then
+			echo "$file_contents" > $SCRIPT_PATH/$SCRIPT_NAME || error_handler 14 "$?"
+			chmod +x $SCRIPT_PATH/$SCRIPT_NAME || error_handler 15 "$?"
+			SCRIPT_VERSION_NUMBER=$( parse_version_data 'main' )
+			SCRIPT_PATCH_NUMBER=$( parse_version_data 'patch' )
 			print_screen_output "Successfully updated to $2 version: $SCRIPT_VERSION_NUMBER"
+			print_screen_output "New $2 version patch number: $SCRIPT_PATCH_NUMBER"
 			print_screen_output "To run the new version, just start $SCRIPT_NAME again."
+			print_screen_output "----------------------------------------"
+			print_screen_output "Starting download of man page file now."
+			if [[ ! -d $MAN_FILE_LOCATION ]];then
+				print_screen_output "The required man directory was not detected on your system, unable to continue: $MAN_FILE_LOCATION"
+			else
+				if [[ $B_ROOT == 'true' ]];then
+					print_screen_output "Checking Man page download URL..."
+					if [[ -f /usr/share/man/man8/inxi.8.gz ]];then
+						print_screen_output "Updating man page location to man1."
+						mv -f /usr/share/man/man8/inxi.8.gz /usr/share/man/man1/inxi.1.gz 
+						if [[ -n $( type -p mandb ) ]];then
+							exec $( type -p mandb ) -q 
+						fi
+					fi
+					wget -q --spider $MAN_FILE_DOWNLOAD || wget_man_error=$?
+					if [[ $wget_man_error -eq 0 ]];then
+						print_screen_output "Man file download URL verified: $MAN_FILE_DOWNLOAD"
+						print_screen_output "Downloading Man page file now."
+						wget -q -O $man_file_path $MAN_FILE_DOWNLOAD || wget_man_error=$?
+						if [[ $wget_man_error -gt 0 ]];then
+							print_screen_output "Oh no! Something went wrong downloading the Man gz file at: $MAN_FILE_DOWNLOAD"
+							print_screen_output "Check the error messages for what happened. Error: $wget_man_error"
+						else
+							print_screen_output "Download/install of man page successful. Check to make sure it works: man inxi"
+						fi
+					else
+						print_screen_output "Man file download URL failed, unable to continue: $MAN_FILE_DOWNLOAD"
+					fi
+				else
+					print_screen_output "Updating / Installing the Man page requires root user, writing to: $MAN_FILE_LOCATION"
+					print_screen_output "If you want the man page, you'll have to run $SCRIPT_NAME -$3 as root."
+				fi
+			fi
 			exit 0
+		else
+			error_handler 16
 		fi
-	fi
 	# now run the error handlers on any wget failure
-	if [[ $wget_error -gt 0 ]];then
+	else
 		if [[ $2 == 'svn server' ]];then
 			error_handler 8 "$wget_error"
 		elif [[ $2 == 'alt server' ]];then
@@ -938,6 +1527,478 @@ script_self_updater()
 	eval $LOGFS
 }
 
+# args: $1 - debug data type: sys|xorg|disk
+debug_data_collector()
+{
+	local xiin_app='' xiin_data_file='' xiin_download='' error='' b_run_xiin='false'
+	local debug_data_dir='' bsd_string=''
+	local completed_gz_file='' xiin_file='xiin.py' ftp_upload='ftp.techpatterns.com/incoming'
+	local Line='-------------------------'
+	local start_directory=$( pwd )
+	
+	if [[ -n $BSD_TYPE ]];then
+		bsd_string="$BSD_TYPE-"
+	fi
+	
+	debug_data_dir="inxi-$bsd_string$(tr ' ' '-' <<< $HOSTNAME | tr '[A-Z]' '[a-z]' )-$1-$(date +%Y%m%d)" 
+	
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		if [[ -n $ALTERNATE_FTP ]];then
+			ftp_upload=$ALTERNATE_FTP
+		fi
+		echo "Starting debugging data collection type: $1"
+		echo -n "Checking/creating required directories... "
+		if [[ ! -d $SCRIPT_DATA_DIR ]];then
+			mkdir $SCRIPT_DATA_DIR
+		fi
+		echo 'completed'
+		cd $SCRIPT_DATA_DIR
+		if [[ -d $SCRIPT_DATA_DIR/$debug_data_dir ]];then
+			echo 'Deleting previous xiin data directory...'
+			rm -rf $SCRIPT_DATA_DIR/$debug_data_dir
+		fi
+		mkdir $SCRIPT_DATA_DIR/$debug_data_dir
+		if [[ -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz ]];then
+			echo 'Deleting previous tar.gz file...'
+			rm -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
+		fi
+		
+		echo 'Collecting system info: sensors, lsusb, lspci, lspci -v data, plus /proc data'
+		echo 'also checking for dmidecode data: note, you must be root to have dmidecode work.'
+		echo "Data going into: $SCRIPT_DATA_DIR/$debug_data_dir"
+		# bsd tools
+		pciconf -vl &> $debug_data_dir/bsd-pciconf-vl.txt
+		sysctl -a &> $debug_data_dir/bsd-sysctl-a.txt
+		
+		dmidecode &> $debug_data_dir/dmidecode.txt
+		
+		lscpu &> $debug_data_dir/lscpu.txt
+		lspci &> $debug_data_dir/lspci.txt
+		lspci -n &> $debug_data_dir/lspci-n.txt
+		lspci -v &> $debug_data_dir/lspci-v.txt
+		lsusb &> $debug_data_dir/lsusb.txt
+		ps aux &> $debug_data_dir/ps-aux.txt
+		runlevel &> $debug_data_dir/runlevel.txt
+		systemctl list-units &> $debug_data_dir/systemctl-list-units.txt
+		systemctl list-units --type=target &> $debug_data_dir/systemctl-list-units-target.txt
+		initctl list &> $debug_data_dir/initctl-list.txt
+		sensors &> $debug_data_dir/sensors.txt
+		strings --version  &> $debug_data_dir/strings.txt
+		nvidia-smi -q &> $debug_data_dir/nvidia-smi-q.txt
+		nvidia-smi -q -x &> $debug_data_dir/nvidia-smi-xq.txt
+		
+		ls /usr/bin/gcc* &> $debug_data_dir/gcc-sys-versions.txt
+		gcc --version &> $debug_data_dir/gcc-version.txt
+		cat /etc/issue &> $debug_data_dir/etc-issue.txt
+		cat $FILE_LSB_RELEASE &> $debug_data_dir/lsb-release.txt
+		cat $FILE_OS_RELEASE &> $debug_data_dir/os-release.txt
+		cat $FILE_ASOUND_DEVICE &> $debug_data_dir/proc-asound-device.txt
+		cat $FILE_ASOUND_VERSION &> $debug_data_dir/proc-asound-version.txt
+		cat $FILE_CPUINFO &> $debug_data_dir/proc-cpu-info.txt
+		cat $FILE_MEMINFO &> $debug_data_dir/proc-meminfo.txt
+		cat $FILE_MODULES &> $debug_data_dir/proc-modules.txt
+		cat /proc/net/arp &> $debug_data_dir/proc-net-arp.txt 
+		# bsd data
+		cat /var/run/dmesg.boot &> $debug_data_dir/bsd-var-run-dmesg.boot.txt 
+		
+		check_recommends_user_output &> $debug_data_dir/check-recommends-user-output.txt
+		# first download and verify xiin
+		if [[ $B_UPLOAD_DEBUG_DATA == 'true' || $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then
+			touch $SCRIPT_DATA_DIR/$debug_data_dir/xiin-error.txt
+			echo "Downloading required tree traverse tool $xiin_file..."
+			if [[ -f xiin && ! -f $xiin_file ]];then
+				mv -f xiin $xiin_file
+			fi
+			# -Nc is creating really weird download anomolies, so using -O instead
+			xiin_download="$( wget -q -O - http://inxi.googlecode.com/svn/branches/xiin/$xiin_file )"
+			# if nothing got downloaded kick out error, otherwise we'll use an older version
+			if [[ $? -gt 0 && ! -f $xiin_file ]];then
+				echo -e "ERROR: Failed to download required file: $xiin_file\nMaybe the remote site is down or your networking is broken?"
+				echo "Continuing with incomplete data collection."
+				echo "$xiin_file download failed and no existing $xiin_file" >> $debug_data_dir/xiin-error.txt
+			elif [[ -n $( grep -s '# EOF' <<< "$xiin_download" ) || -f $xiin_file ]];then
+				if [[ -n $( grep -s '# EOF' <<< "$xiin_download" ) ]];then
+					echo "Updating $xiin_file from remote location"
+					echo "$xiin_download" > $xiin_file
+				else
+					echo "Using local $xiin_file due to download failure"
+				fi
+				b_run_xiin='true'
+			else
+				echo -e "ERROR: $xiin_file downloaded but the program file data is corrupted.\nContinuing with incomplete data collection."
+				echo "$xiin_file downloaded but the program file data is corrupted." >> $debug_data_dir/xiin-error.txt
+			fi
+		fi
+		# note, only bash 4> supports ;;& for case, so using if/then here
+		if [[ $1 == 'disk' || $1 == 'sys' || $1 == 'all' ]];then
+			xiin_data_file=$SCRIPT_DATA_DIR/$debug_data_dir/xiin-sys.txt
+			echo 'Collecting networking data...'
+			ifconfig &> $debug_data_dir/ifconfig.txt
+			ip addr &> $debug_data_dir/ip-addr.txt
+			if [[ $b_run_xiin == 'true' && -z $BSD_TYPE ]];then
+				echo $Line
+				echo "Running $xiin_file tool now on /sys..."
+				echo "Using Python version:" && python --version
+				python --version &> $debug_data_dir/python-version.txt
+				python ./$xiin_file -d /sys -f $xiin_data_file
+				if [[ $? -ne 0 ]];then
+					error=$?
+					echo -e "ERROR: $xiin_file exited with error $error - removing data file.\nContinuing with incomplete data collection."
+					echo "Continuing with incomplete data collection."
+					rm -f $xiin_data_file
+					echo "$xiin_file data generation failed with python error $error" >> $debug_data_dir/xiin-error.txt
+				fi
+				echo $Line
+			fi
+		fi
+		if [[ $1 == 'xorg' || $1 == 'all' ]];then
+			if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
+				echo 'Warning: only some of the data collection can occur if you are not in X'
+				touch $debug_data_dir/warning-user-not-in-x
+			fi
+			if [[ $B_ROOT == 'true' ]];then
+				echo 'Warning: only some of the data collection can occur if you are running as Root user'
+				touch $debug_data_dir/warning-root-user
+			fi
+			echo 'Collecting Xorg log and xorg.conf files'
+			if [[ -e $FILE_XORG_LOG ]];then
+				cat $FILE_XORG_LOG &> $debug_data_dir/xorg-log-file.txt
+			else
+				touch $debug_data_dir/no-xorg-log-file
+			fi
+			if [[ -e /etc/X11/xorg.conf ]];then
+				cp /etc/X11/xorg.conf $SCRIPT_DATA_DIR/$debug_data_dir
+			else
+				touch $debug_data_dir/no-xorg-conf-file
+			fi
+			if [[ -n $( ls /etc/X11/xorg.conf.d/ 2>/dev/null ) ]];then
+				ls /etc/X11/xorg.conf.d &> $debug_data_dir/ls-etc-x11-xorg-conf-d.txt
+				cp /etc/X11/xorg.conf.d $SCRIPT_DATA_DIR/$debug_data_dir
+			else
+				touch $debug_data_dir/no-xorg-conf-d-files
+			fi
+			echo 'Collecting X, xprop, glxinfo, xrandr, xdpyinfo data...'
+			xprop -root &> $debug_data_dir/xprop_root.txt
+			glxinfo &> $debug_data_dir/glxinfo.txt
+			xdpyinfo &> $debug_data_dir/xdpyinfo.txt
+			xrandr &> $debug_data_dir/xrandr.txt
+			X -version &> $debug_data_dir/x-version.txt
+			Xorg -version &> $debug_data_dir/xorg-version.txt
+			echo $GNOME_DESKTOP_SESSION_ID &> $debug_data_dir/gnome-desktop-session-id.txt
+			# kde 3 id
+			echo $KDE_FULL_SESSION &> $debug_data_dir/kde3-ful-session.txt
+			echo $KDE_SESSION_VERSION &> $debug_data_dir/kde456-session-version.txt
+			echo "$(kded$KDE_SESSION_VERSION --version )" &> $debug_data_dir/kde-version-data.txt
+			echo $XDG_CURRENT_DESKTOP &> $debug_data_dir/xdg-current-desktop.txt
+		fi
+		if [[ $1 == 'disk' || $1 == 'all' ]];then
+			echo 'Collecting dev, label, disk, uuid data, df...'
+			ls -l /dev &> $debug_data_dir/dev-data.txt
+			ls -l /dev/disk &> $debug_data_dir/dev-disk-data.txt
+			ls -l /dev/disk/by-id &> $debug_data_dir/dev-disk-id-data.txt
+			ls -l /dev/disk/by-label &> $debug_data_dir/dev-disk-label-data.txt
+			ls -l /dev/disk/by-uuid &> $debug_data_dir/dev-disk-uuid-data.txt
+			ls -l /dev/disk/by-path &> $debug_data_dir/dev-disk-path-data.txt
+			ls -l /dev/mapper &> $debug_data_dir/dev-disk-mapper-data.txt
+			readlink /dev/root &> $debug_data_dir/dev-root.txt
+			df -h -T -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 --exclude-type=devfs --exclude-type=linprocfs --exclude-type=sysfs --exclude-type=fdescfs &> $debug_data_dir/df-h-T-P-excludes.txt
+			df -T -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 --exclude-type=devfs --exclude-type=linprocfs --exclude-type=sysfs --exclude-type=fdescfs &> $debug_data_dir/df-T-P-excludes.txt
+			df -H -T &> $debug_data_dir/bsd-df-H-T-no-excludes.txt
+			df -H &> $debug_data_dir/bsd-df-H-no-excludes.txt
+			# bsd tool
+			mount &> $debug_data_dir/mount.txt
+			gpart list &> $debug_data_dir/bsd-gpart-list.txt
+			gpart show &> $debug_data_dir/bsd-gpart-show.txt
+			gpart status &> $debug_data_dir/bsd-gpart-status.txt
+			swapctl -l &> $debug_data_dir/bsd-swapctl-l.txt
+			swapon -s &> $debug_data_dir/swapon-s.txt
+			sysctl -b kern.geom.conftxt  &> $debug_data_dir/bsd-sysctl-b-kern.geom.conftxt.txt
+			sysctl -b kern.geom.confxml &> $debug_data_dir/bsd-sysctl-b-kern.geom.confxml.txt
+			zfs list &> $debug_data_dir/bsd-zfs-list.txt
+			zpool list &> $debug_data_dir/bsd-zpool-list.txt
+			zpool list -v &> $debug_data_dir/bsd-zpool-list-v.txt
+			df -P --exclude-type=aufs --exclude-type=squashfs --exclude-type=unionfs --exclude-type=devtmpfs --exclude-type=tmpfs --exclude-type=iso9660 &> $debug_data_dir/df-P-excludes.txt
+			df -P &> $debug_data_dir/bsd-df-P-no-excludes.txt
+			cat /proc/mdstat &> $debug_data_dir/proc-mdstat.txt
+			cat $FILE_PARTITIONS &> $debug_data_dir/proc-partitions.txt
+			cat $FILE_SCSI &> $debug_data_dir/proc-scsi.txt
+			cat $FILE_MOUNTS &> $debug_data_dir/proc-mounts.txt
+			cat /proc/sys/dev/cdrom/info &> $debug_data_dir/proc-cdrom-info.txt
+			ls /proc/ide/ &> $debug_data_dir/proc-ide.txt
+			cat /proc/ide/*/* &> $debug_data_dir/proc-ide-hdx-cat.txt
+			cat /etc/fstab &> $debug_data_dir/etc-fstab.txt
+			cat /etc/mtab &> $debug_data_dir/etc-mtab.txt
+		fi
+		echo 'Creating inxi output file now. This can take a few seconds...'
+		echo "Starting $SCRIPT_NAME from: $start_directory"
+		cd $start_directory
+		$SCRIPT_PATH/$SCRIPT_NAME -FRploudxxx -c 0 -@ 8 > $SCRIPT_DATA_DIR/$debug_data_dir/inxi-FRploudxxx.txt
+		cp $LOG_FILE $SCRIPT_DATA_DIR/$debug_data_dir
+		if [[ -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz ]];then
+			echo "Found and removing previous tar.gz data file: $debug_data_dir.tar.gz"
+			rm -f $SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
+		fi
+		cd $SCRIPT_DATA_DIR
+		echo 'Creating tar.gz compressed file of this material now. Contents:'
+		echo $Line
+		tar -cvzf $debug_data_dir.tar.gz $debug_data_dir
+		echo $Line
+		echo 'Cleaning up leftovers...'
+		rm -rf $debug_data_dir
+		echo 'Testing gzip file integrity...'
+		gzip -t $debug_data_dir.tar.gz
+		if [[ $? -gt 0 ]];then
+			echo 'Data in gz is corrupted, removing gzip file, try running data collector again.'
+			rm -f $debug_data_dir.tar.gz
+			echo "Data in gz is corrupted, removed gzip file" >> $debug_data_dir/gzip-error.txt
+		else
+			echo 'All done, you can find your data gzipped directory here:'
+			completed_gz_file=$SCRIPT_DATA_DIR/$debug_data_dir.tar.gz
+			echo $completed_gz_file
+			if [[ $B_UPLOAD_DEBUG_DATA == 'true' ]];then
+				echo $Line
+				if [[ $b_run_xiin == 'true' ]];then
+					echo "Running automatic upload of data to remote server $ftp_upload now..."
+					python ./$xiin_file --version
+					python ./$xiin_file -u $completed_gz_file $ftp_upload
+					if [[ $? -gt 0 ]];then
+						echo $Line
+						echo "Error: looks like the ftp upload failed. Error number: $?"
+						echo "The ftp upload failed. Error number: $?" >> $debug_data_dir/xiin-error.txt
+					fi
+				else
+					echo 'Unable to run the automoatic ftp upload because of an error with the xiin download.'
+					echo "Unable to run the automoatic ftp upload because of an error with the xiin download" >> $debug_data_dir/xiin-error.txt
+				fi
+			else
+				echo 'You can upload this here using most file managers: ftp.techpatterns.com/incoming'
+				echo 'then let a maintainer know it is uploaded.'
+			fi
+		fi
+	else
+		echo 'This feature only available in console or shell client! Exiting now.'
+	fi
+	exit 0
+}
+
+check_recommends_user_output()
+{
+	local Line='-----------------------------------------------------------------------------------------'
+	local gawk_version='N/A' sed_version='N/A' sudo_version='N/A' python_version='N/A'
+	
+	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
+		print_screen_output "Sorry, you can't run this option in an IRC client."
+		exit 1
+	fi
+	
+	initialize_paths
+	
+	echo "$SCRIPT_NAME will now begin checking for the programs it needs to operate. First a check of"
+	echo "the main languages and tools $SCRIPT_NAME uses. Python is only for debugging data collection."
+	echo $Line
+	echo "Bash version: $( bash --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU bash/ {print $4}' )"
+	if [[ -n $( type -p gawk ) ]];then
+		gawk_version=$( gawk --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU Awk/ {print $3}' )
+	fi
+	if [[ -n $( type -p sed ) ]];then
+		sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^GNU sed version/ {print $4}' )
+		if [[ -z $sed_version ]];then
+			# note: bsd sed shows error with --version flag
+			sed_version=$( sed --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^sed: illegal option/ {print "BSD sed"}' )
+		fi
+	fi
+	if [[ -n $( type -p sudo ) ]];then
+		sudo_version=$( sudo -V 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Sudo version/ {print $3}' )
+	fi
+	if [[ -n $( type -p python ) ]];then
+		python_version=$( python --version 2>&1 | awk 'BEGIN {IGNORECASE=1} /^Python/ {print $2}' )
+	fi
+	echo "Gawk version: $gawk_version"
+	echo "Sed version: $sed_version"
+	echo "Sudo version: $sudo_version"
+	echo "Python version: $python_version"
+	echo $Line
+	echo "Test One: Required System Directories."
+	echo "If one of these system directories is missing, $SCRIPT_NAME cannot operate:"
+	echo 
+	check_recommends_items 'required-dirs'
+	echo "Test Two: Required Core Applications."
+	echo "If one of these applications is missing, $SCRIPT_NAME cannot operate:"
+	echo 
+	check_recommends_items 'required-apps'
+	echo 'Test Three: Script Recommends for Graphics Features. If you do not use X these do not matter.'
+	echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output:"
+	echo 
+	check_recommends_items 'recommended-x-apps'
+	echo 'Test Four: Script Recommends for Remaining Features.' 
+	echo "If one of these applications is missing, $SCRIPT_NAME will have incomplete output:"
+	echo 
+	check_recommends_items 'recommended-apps'
+	echo 'Test Five: System Directories for Various Information.' 
+	echo "If one of these directories is missing, $SCRIPT_NAME will have incomplete output:"
+	echo 
+	check_recommends_items 'system-dirs'
+	echo 'All tests completed.' 
+}
+# args: $1 - check item
+check_recommends_items()
+{
+	local item='' item_list='' item_string='' missing_items='' missing_string=''
+	local package='' application='' feature='' type='' starter='' finisher=''
+	local package_deb='' package_pacman='' package_rpm='' 
+	local print_string='' separator=''
+	local required_dirs='/proc /sys'
+	# package-owner: 1 - debian/ubuntu; 2 - arch; 3 - yum/rpm
+	# pardus: pisi sf -q /usr/bin/package
+	local required_apps='
+	df:coreutils~coreutils~coreutils~:partition_data 
+	gawk:gawk~gawk~gawk~:core_tool
+	grep:grep~grep~grep~:string_search 
+	lspci:pciutils~pciutils~pciutils~:hardware_data 
+	ps:procps~procps~procps~:process_data 
+	readlink:coreutils~coreutils~coreutils~: 
+	sed:sed~sed~sed~:string_replace 
+	tr:coreutils~coreutils~coreutils~:character_replace 
+	uname:uname~coreutils~coreutils~:kernel_data 
+	uptime:procps~procps~procps~: 
+	wc:coreutils~coreutils~coreutils~:word_character_count
+	'
+	local x_recommends='
+	glxinfo:mesa-utils~mesa-demos~glx-utils_(openSUSE_12.3_and_later_Mesa-demo-x)~:-G_glx_info 
+	xdpyinfo:X11-utils~xorg-xdpyinfo~xorg-x11-utils~:-G_multi_screen_resolution 
+	xprop:X11-utils~xorg-xprop~x11-utils~:-S_desktop_data 
+	xrandr:x11-xserver-utils~xrandr~x11-server-utils~:-G_single_screen_resolution
+	'
+	local recommended_apps='
+	dmidecode:dmidecode~dmidecode~dmidecode~:-M_if_no_sys_machine_data 
+	file:file~file~file~:-o_unmounted_file_system
+	hddtemp:hddtemp~hddtemp~hddtemp~:-Dx_show_hdd_temp 
+	ifconfig:net-tools~net-tools~net-tools~:-i_ip_lan-deprecated
+	ip:iproute~iproute2~iproute~:-i_ip_lan
+	sensors:lm-sensors~lm_sensors~lm-sensors~:-s_sensors_output
+	strings:binutils~~~:-I_sysvinit_version
+	lsusb:usbutils~usbutils~usbutils~:-A_usb_audio;-N_usb_networking 
+	modinfo:module-init-tools~module-init-tools~module-init-tools~:-Ax,-Nx_module_version 
+	runlevel:sysvinit~sysvinit~systemd~:-I_runlevel
+	sudo:sudo~sudo~sudo~:-Dx_hddtemp-user;-o_file-user
+	'
+	local recommended_dirs='
+	/sys/class/dmi/id:-M_system,_motherboard,_bios
+	/dev:-l,-u,-o,-p,-P,-D_disk_partition_data
+	/dev/disk/by-label:-l,-o,-p,-P_partition_labels
+	/dev/disk/by-uuid:-u,-o,-p,-P_partition_uuid
+	/var/run/dmesg.boot:-C,-f_(BSD_only)
+	'
+	
+	case $1 in
+		required-dirs)
+			item_list=$required_dirs
+			item_string='Required file system'
+			missing_string='system directories'
+			type='directories'
+			;;
+		required-apps)
+			item_list=$required_apps
+			item_string='Required application'
+			missing_string='applications, and their corresponding packages,'
+			type='applications'
+			;;
+		recommended-x-apps)
+			item_list=$x_recommends
+			item_string='Recommended X application'
+			missing_string='applications, and their corresponding packages,'
+			type='applications'
+			;;
+		recommended-apps)
+			item_list=$recommended_apps
+			item_string='Recommended application'
+			missing_string='applications, and their corresponding packages,'
+			type='applications'
+			;;
+		system-dirs)
+			item_list=$recommended_dirs
+			item_string='System directory'
+			missing_string='system directories'
+			type='directories'
+			;;
+	esac
+	# great trick from: http://ideatrash.net/2011/01/bash-string-padding-with-sed.html
+	# left pad: sed -e :a -e 's/^.\{1,80\}$/& /;ta'
+	# right pad: sed -e :a -e 's/^.\{1,80\}$/ &/;ta'
+	# center pad: sed -e :a -e 's/^.\{1,80\}$/ & /;ta'
+	
+	for item in $item_list
+	do
+		if [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 0 ]];then
+			application=$item
+			package=''
+			feature=''
+			location=''
+		elif [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 1 ]];then
+			application=$( cut -d ':' -f 1 <<< $item )
+			package=''
+			feature=$( cut -d ':' -f 2 <<< $item )
+			location=''
+		else
+			application=$( cut -d ':' -f 1 <<< $item )
+			package=$( cut -d ':' -f 2 <<< $item )
+			location=$( type -p $application )
+			if [[ $( awk -F ":" '{print NF-1}' <<< $item ) -eq 2 ]];then
+				feature=$( cut -d ':' -f 3 <<< $item )
+			else
+				feature=''
+			fi
+		fi
+		if [[ -n $feature ]];then
+			print_string="$item_string: $application (info: $( sed 's/_/ /g' <<< $feature ))"
+		else
+			print_string="$item_string: $application"
+		fi
+		
+		starter="$( sed -e :a -e 's/^.\{1,75\}$/&./;ta' <<< $print_string )"
+		if [[ -z $( grep '^/' <<< $application ) && -n $location ]] || [[ -d $application ]];then
+			if [[ -n $location ]];then
+				finisher=" $location"
+			else
+				finisher=" Present"
+			fi
+		else
+			finisher=" Missing"
+			missing_items="$missing_items$separator$application:$package"
+			separator=' '
+		fi
+		
+		echo "$starter$finisher"
+	done
+	echo 
+	if [[ -n $missing_items ]];then
+		echo "The following $type are missing from your system:"
+		for item in $missing_items
+		do
+			application=$( cut -d ':' -f 1 <<< $item )
+			if [[ $type == 'applications' ]];then
+				# echo '--------------------------------------------------------'
+				echo
+				package=$( cut -d ':' -f 2 <<< $item )
+				package_deb=$( cut -d '~' -f 1 <<< $package )
+				package_pacman=$( cut -d '~' -f 2 <<< $package )
+				package_rpm=$( cut -d '~' -f 3 <<< $package )
+				echo "Application: $application"
+				echo "To add to your system, install the proper distribution package for your system:"
+				echo "Debian/Ubuntu: $package_deb :: Arch Linux: $package_pacman :: Redhat/Fedora/Suse: $package_rpm"
+			else
+				echo "Directory: $application"
+			fi
+		done
+		if [[ $item_string == 'System directory' ]];then
+			echo "These directories are created by the kernel, so don't worry if they are not present."
+		fi
+	else
+		echo "All the $( cut -d ' ' -f 1 <<< $item_string | sed -e 's/Re/re/' -e 's/Sy/sy/' ) $type are present."
+	fi
+	echo $Line
+}
+
 #### -------------------------------------------------------------------
 #### print / output cleaners
 #### -------------------------------------------------------------------
@@ -969,12 +2030,12 @@ print_screen_output()
 		fi
 	fi
 
-	if [[ $KONVI -eq 1 ]]; then ## dcop Konversation (<= 1.1 (qt3))
+	if [[ $KONVI -eq 1 && $B_DCOP == 'true' ]]; then ## dcop Konversation (<= 1.1 (qt3))
 		# konvi doesn't seem to like \n characters, it just prints them literally
 		$print_data="$( tr '\n' ' ' <<< "$print_data" )"
 		dcop "$DCPORT" "$DCOPOBJ" say "$DCSERVER" "$DCTARGET" "$print_data"
 
-	elif [[ $KONVI -eq 3 ]]; then ## dbus Konversation (> 1.2 (qt4))
+	elif [[ $KONVI -eq 3 && $B_QDBUS == 'true' ]]; then ## dbus Konversation (> 1.2 (qt4))
 		qdbus org.kde.konversation /irc say "$DCSERVER" "$DCTARGET" "$print_data"
 
 #	elif [[ $IRC_CLIENT == 'X-Chat' ]]; then
@@ -1028,30 +2089,78 @@ remove_erroneous_chars()
 get_parameters()
 {
 	eval $LOGFS
-	local opt='' wget_test='' update_flags='U!:'
+	local opt='' wget_test='' debug_data_type='' weather_flag='wW:' 
 	local use_short='true' # this is needed to trigger short output, every v/d/F/line trigger sets this false
 
-	# If distro maintainers want to not allow updates, turn off that option for users
-	if [[ $B_ALLOW_UPDATE == 'false' ]];then
-		update_flags=''
+	# if distro maintainers don't want the weather feature disable it
+	if [[ $B_ALLOW_WEATHER == 'false' ]];then
+		weather_flag=''
+		
 	fi
-
+	if [[ $1 == '--version' ]];then
+		print_version_info
+		exit 0
+	elif [[ $1 == '--help' ]];then
+		show_options
+		exit 0
+	elif [[ $1 == '--recommends' ]];then
+		check_recommends_user_output
+		exit 0
 	# the short form only runs if no args output args are used
 	# no need to run through these if there are no args
-	if [[ -n $1 ]];then
-		while getopts Ac:CdDfFGhHiIlNopPrsSt:uv:Vx%@:${update_flags} opt
+	# reserved for future use: -g for extra Graphics; -m for extra Machine; -d for extra Disk
+	elif [[ -n $1 ]];then
+		while getopts Abc:CdDfFGhHiIlMnNopPrRsSt:uUv:V${weather_flag}xzZ%@:!: opt
 		do
 			case $opt in
 			A)	B_SHOW_AUDIO='true'
 				use_short='false'
 				;;
+			b)	use_short='false'
+				B_SHOW_BASIC_CPU='true'
+				B_SHOW_BASIC_RAID='true'
+				B_SHOW_DISK_TOTAL='true'
+				B_SHOW_GRAPHICS='true'
+				B_SHOW_INFO='true'
+				B_SHOW_MACHINE='true'
+				B_SHOW_NETWORK='true'
+				B_SHOW_SYSTEM='true'
+				;;
 			c)	if [[ -n $( grep -E '^[0-9][0-9]?$' <<< $OPTARG ) ]];then
-					COLOR_SCHEME_SET='true'
-					## note: not sure about this, you'd think user values should be overridden, but
-					## we'll leave this for now
-					if [[ -z $COLOR_SCHEME ]];then
-						set_color_scheme "$OPTARG"
-					fi
+					case $OPTARG in
+						99)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='global'
+							;;
+						98)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='irc-console'
+							;;
+						97)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='irc-virtual-terminal'
+							;;
+						96)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='irc'
+							;;
+						95)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='virtual-terminal'
+							;;
+						94)
+							B_RUN_COLOR_SELECTOR='true'
+							COLOR_SELECTION='console'
+							;;
+						*)	
+							B_COLOR_SCHEME_SET='true'
+							## note: not sure about this, you'd think user values should be overridden, but
+							## we'll leave this for now
+							if [[ -z $COLOR_SCHEME ]];then
+								set_color_scheme "$OPTARG"
+							fi
+							;;
+					esac
 				else
 					error_handler 3 "$OPTARG"
 				fi
@@ -1059,8 +2168,10 @@ get_parameters()
 			C)	B_SHOW_CPU='true'
 				use_short='false'
 				;;
-			d)	VERBOSITY_LEVEL=1
+			d)	B_SHOW_DISK='true'
+				B_SHOW_FULL_OPTICAL='true'
 				use_short='false'
+				# error_handler 20 "-d has been replaced by -b"
 				;;
 			D)	B_SHOW_DISK='true'
 				use_short='false'
@@ -1069,11 +2180,20 @@ get_parameters()
 				B_CPU_FLAGS_FULL='true'
 				use_short='false'
 				;;
-			F)	VERBOSITY_LEVEL=$VERBOSITY_LEVELS
-				B_EXTRA_DATA='true'
+			F)	# B_EXTRA_DATA='true'
+				B_SHOW_ADVANCED_NETWORK='true'
+				B_SHOW_AUDIO='true'
+				# B_SHOW_BASIC_OPTICAL='true'
+				B_SHOW_CPU='true'
 				B_SHOW_DISK='true'
+				B_SHOW_GRAPHICS='true'
+				B_SHOW_INFO='true'
+				B_SHOW_MACHINE='true'
+				B_SHOW_NETWORK='true'
 				B_SHOW_PARTITIONS='true'
-				B_SHOW_AUDIO='true'
+				B_SHOW_RAID='true'
+				B_SHOW_SENSORS='true'
+				B_SHOW_SYSTEM='true'
 				use_short='false'
 				;;
 			G)	B_SHOW_GRAPHICS='true'
@@ -1081,6 +2201,7 @@ get_parameters()
 				;;
 			i)	B_SHOW_IP='true'
 				B_SHOW_NETWORK='true'
+				B_SHOW_ADVANCED_NETWORK='true'
 				use_short='false'
 				;;
 			I)	B_SHOW_INFO='true'
@@ -1090,10 +2211,17 @@ get_parameters()
 				B_SHOW_PARTITIONS='true'
 				use_short='false'
 				;;
+			M)	B_SHOW_MACHINE='true'
+				use_short='false'
+				;;
+			n)	B_SHOW_ADVANCED_NETWORK='true'
+				B_SHOW_NETWORK='true'
+				use_short='false'
+				;;
 			N)	B_SHOW_NETWORK='true'
 				use_short='false'
 				;;
-			o) B_SHOW_UNMOUNTED_PARTITIONS='true'
+			o)	B_SHOW_UNMOUNTED_PARTITIONS='true'
 				use_short='false'
 				;;
 			p)	B_SHOW_PARTITIONS_FULL='true'
@@ -1106,7 +2234,13 @@ get_parameters()
 			r)	B_SHOW_REPOS='true'
 				use_short='false'
 				;;
-			
+			R)	B_SHOW_RAID='true'
+				# it turns out only users with mdraid software installed will have raid,
+				# so unless -R is explicitly called, blank -b/-F/-v6 and less output will not show
+				# error if file is missing.
+				B_SHOW_RAID_R='true'
+				use_short='false'
+				;;
 			s)	B_SHOW_SENSORS='true'
 				use_short='false'
 				;;
@@ -1116,7 +2250,7 @@ get_parameters()
 			t)	if [[ -n $( grep -E '^(c|m|cm|mc)([1-9]|1[0-9]|20)?$' <<< $OPTARG ) ]];then
 					use_short='false'
 					if [[ -n $( grep -E '[0-9]+' <<< $OPTARG ) ]];then
-						PS_COUNT=$( grep -Eo '[0-9]+' <<< $OPTARG )
+						PS_COUNT=$( sed 's/[^0-9]//g' <<< $OPTARG )
 					fi
 					if [[ -n $( grep 'c' <<< $OPTARG ) ]];then
 						B_SHOW_PS_CPU_DATA='true'
@@ -1133,20 +2267,84 @@ get_parameters()
 				use_short='false'
 				;;
 			v)	if [[ -n $( grep -E "^[0-9][0-9]?$" <<< $OPTARG ) && $OPTARG -le $VERBOSITY_LEVELS ]];then
-					VERBOSITY_LEVEL="$OPTARG"
-					if [[ $OPTARG -gt 0 ]];then
+					if [[ $OPTARG -ge 1 ]];then
 						use_short='false'
+						B_SHOW_BASIC_CPU='true'
+						B_SHOW_DISK_TOTAL='true'
+						B_SHOW_GRAPHICS='true'
+						B_SHOW_INFO='true'
+						B_SHOW_SYSTEM='true'
+					fi
+					if [[ $OPTARG -ge 2 ]];then
+						B_SHOW_BASIC_DISK='true'
+						B_SHOW_BASIC_RAID='true'
+						B_SHOW_MACHINE='true'
+						B_SHOW_NETWORK='true'
+					fi
+					if [[ $OPTARG -ge 3 ]];then
+						B_SHOW_ADVANCED_NETWORK='true'
+						B_SHOW_CPU='true'
+						B_EXTRA_DATA='true'
+					fi
+					if [[ $OPTARG -ge 4 ]];then
+						B_SHOW_DISK='true'
+						B_SHOW_PARTITIONS='true'
+					fi
+					if [[ $OPTARG -ge 5 ]];then
+						B_SHOW_AUDIO='true'
+						B_SHOW_BASIC_OPTICAL='true'
+						B_SHOW_SENSORS='true'
+						B_SHOW_LABELS='true'
+						B_SHOW_UUIDS='true'
+						B_SHOW_RAID='true'
+					fi
+					if [[ $OPTARG -ge 6 ]];then
+						B_SHOW_FULL_OPTICAL='true'
+						B_SHOW_PARTITIONS_FULL='true'
+						B_SHOW_UNMOUNTED_PARTITIONS='true'
+						B_EXTRA_EXTRA_DATA='true'
+					fi
+					if [[ $OPTARG -ge 7 ]];then
+						B_EXTRA_EXTRA_EXTRA_DATA='true'
+						B_SHOW_IP='true'
+						B_SHOW_RAID_R='true'
 					fi
 				else
 					error_handler 4 "$OPTARG"
 				fi
 				;;
-			U)	script_self_updater "$SCRIPT_DOWNLOAD" 'svn server'
+			U)	if [[ $B_ALLOW_UPDATE == 'true' ]];then
+					script_self_updater "$SCRIPT_DOWNLOAD" 'svn server' "$opt"
+				else
+					error_handler 17 "-$opt"
+				fi
 				;;
 			V)	print_version_info
 				exit 0
 				;;
-			x)	B_EXTRA_DATA='true'
+			w)	B_SHOW_WEATHER=true
+				use_short='false'
+				;;
+			W)	ALTERNATE_WEATHER_LOCATION=$( sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//'  <<< $OPTARG )
+				if [[ -n $( grep -Esi '([^,]+,.+|[0-9-]+)' <<< $ALTERNATE_WEATHER_LOCATION ) ]];then
+					B_SHOW_WEATHER=true
+					use_short='false'
+				else
+					error_handler 18 "-$opt: '$OPTARG'" "city,state OR latitude,longitude OR postal/zip code."
+				fi
+				;;
+			# this will trigger either with x, xx, xxx or with Fx but not with xF
+			x)	if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+					B_EXTRA_EXTRA_EXTRA_DATA='true'
+				elif [[ $B_EXTRA_DATA == 'true' ]];then
+					B_EXTRA_EXTRA_DATA='true'
+				else
+					B_EXTRA_DATA='true'
+				fi
+				;;
+			z)	B_OUTPUT_FILTER='true'
+				;;
+			Z)	B_OVERRIDE_FILTER='true'
 				;;
 			h)	show_options
 				exit 0
@@ -1157,22 +2355,45 @@ get_parameters()
 			## debuggers and testing tools
 			%)	B_HANDLE_CORRUPT_DATA='true'
 				;;
-			@)	if [[ -n $( grep -E "^([1-9]|10)$" <<< $OPTARG ) ]];then
+			@)	if [[ -n $( grep -E "^([1-9]|1[0-4])$" <<< $OPTARG ) ]];then
 					DEBUG=$OPTARG
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						B_UPLOAD_DEBUG_DATA='true'
+					fi
 					exec 2>&1
 					# switch on logging only for -@ 8-10
-					if [[ $OPTARG -ge 8 ]];then
-						if [[ $OPTARG -eq 10 ]];then
-							B_LOG_COLORS='true'
-						elif [[ $OPTARG -eq 9 ]];then		
-							B_LOG_FULL_DATA='true'
-						fi
-						B_USE_LOGGING='true'
-						# pack the logging data for evals function start/end
-						LOGFS=$LOGFS_STRING
-						LOGFE=$LOGFE_STRING
-						create_rotate_logfiles # create/rotate logfiles before we do anything else
-					fi
+					case $OPTARG in
+						8|9|10)
+							if [[ $OPTARG -eq 10 ]];then
+								B_LOG_COLORS='true'
+							elif [[ $OPTARG -eq 9 ]];then		
+								B_LOG_FULL_DATA='true'
+							fi
+							B_USE_LOGGING='true'
+							# pack the logging data for evals function start/end
+							LOGFS=$LOGFS_STRING
+							LOGFE=$LOGFE_STRING
+							create_rotate_logfiles # create/rotate logfiles before we do anything else
+							;;
+						11|12|13|14)
+							case $OPTARG in
+								11)
+									debug_data_type='sys'
+									;;
+								12)
+									debug_data_type='xorg'
+									;;
+								13)
+									debug_data_type='disk'
+									;;
+								14)
+									debug_data_type='all'
+									;;
+							esac
+							initialize_data
+							debug_data_collector $debug_data_type
+							;;
+					esac
 				else
 					error_handler 9 "$OPTARG"
 				fi
@@ -1186,23 +2407,53 @@ get_parameters()
 					3)	B_TESTING_1='true'
 						B_TESTING_2='true'
 						;;
-					10)
-						script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server'
+					1[0-6]|http*)
+						if [[ $B_ALLOW_UPDATE == 'true' ]];then
+							case $OPTARG in
+								10)
+									script_self_updater "$SCRIPT_DOWNLOAD_DEV" 'dev server' "$opt $OPTARG"
+									;;
+								11)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server' "$opt $OPTARG"
+									;;
+								12)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server' "$opt $OPTARG"
+									;;
+								13)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server' "$opt $OPTARG"
+									;;
+								14)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server' "$opt $OPTARG"
+									;;
+								15)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_BSD" 'svn: branch bsd server' "$opt $OPTARG"
+									;;
+								16)
+									script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_GNUBSD" 'svn: branch gnubsd server' "$opt $OPTARG"
+									;;
+								http*)
+									script_self_updater "$OPTARG" 'alt server' "$opt <http...>"
+									;;
+							esac
+						else
+							error_handler 17 "-$opt $OPTARG"
+						fi
 						;;
-					11)
-						script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_1" 'svn: branch one server'
+					30)
+						B_RUNNING_IN_SHELL='true'
 						;;
-					12)
-						script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_2" 'svn: branch two server'
+					31)
+						B_SHOW_HOST='false'
 						;;
-					13)
-						script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_3" 'svn: branch three server'
+					32)
+						B_SHOW_HOST='true'
 						;;
-					14)
-						script_self_updater "$SCRIPT_DOWNLOAD_BRANCH_4" 'svn: branch four server'
+					ftp*)
+						ALTERNATE_FTP="$OPTARG"
 						;;
-					http*)
-						script_self_updater "$OPTARG" 'alt server'
+					# for weather function, allows user to set an alternate weather location
+					location=*)
+						error_handler 19 "-$opt location=" "-W"
 						;;
 					*)	error_handler 11 "$OPTARG"
 						;;
@@ -1224,375 +2475,391 @@ get_parameters()
 	if [[ $use_short == 'true' ]];then
 		B_SHOW_SHORT_OUTPUT='true'
 	fi
+	# just in case someone insists on using -zZ
+	if [[ $B_OVERRIDE_FILTER == 'true' ]];then
+		B_OUTPUT_FILTER='false'
+	fi
+	# change basic to full if user requested it or if arg overrides it
+	if [[ $B_SHOW_RAID == 'true' && $B_SHOW_BASIC_RAID == 'true' ]];then
+		B_SHOW_BASIC_RAID='false'
+	fi
+	
+	
 	eval $LOGFE
 }
 
 ## print out help menu, not including Testing or Debugger stuff because it's not needed
 show_options()
 {
-	local color_scheme_count=${#A_COLOR_SCHEMES[@]}
-
-	print_screen_output "$SCRIPT_NAME supports the following options. You can combine them, or list them"
-	print_screen_output "one by one: Examples: $SCRIPT_NAME -v4 -c6 OR $SCRIPT_NAME -dDc 6"
-	print_screen_output ""
-	print_screen_output "If you start $SCRIPT_NAME with no arguments, it will show the short form."
-	print_screen_output "The following options if used without -d or -v will show just that complete line:"
-	print_screen_output "A,C,D,G,I,N,P,S - you can use these together to show just the lines you want to see."
-	print_screen_output "If you use them with a -v level (or -d), it will show the full output for that line "
-	print_screen_output "along with the output for the chosen verbosity level."
+	local color_scheme_count=$(( ${#A_COLOR_SCHEMES[@]} - 1 ))
+	local partition_string='partition' partition_string_u='Partition'
+	
+	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
+		print_screen_output "Sorry, you can't run the help option in an IRC client."
+		exit 1
+	fi
+	if [[ -n $BSD_TYPE ]];then
+		partition_string='slice'
+		partition_string_u='Slice'
+	fi
+	# print_lines_basic "0" "" ""
+	# print_lines_basic "1" "" ""
+	# print_lines_basic "2" "" ""
+	# print_screen_output " "
+	print_lines_basic "0" "" "$SCRIPT_NAME supports the following options. You can combine them, or list them one by one. Examples: $SCRIPT_NAME^-v4^-c6 OR $SCRIPT_NAME^-bDc^6. If you start $SCRIPT_NAME with no arguments, it will show the short form."
+	print_screen_output " "
+	print_lines_basic "0" "" "The following options if used without -F, -b, or -v will show just option line(s): A, C, D, G, I, M, N, P, R, S, f, i, n, o, p, l, u, r, s, t - you can use these alone or together to show just the line(s) you want to see. If you use them with -v [level], -b or -F, it will show the full output for that line along with the output for the chosen verbosity level."
+	
 	print_screen_output "- - - - - - - - - - - - - - - - - - - - - - - - - - - - -"
 	print_screen_output "Output Control Options:"
-	print_screen_output "-A  Show Audio/sound card information."
-	print_screen_output "-c  Available color schemes. Scheme number is required."
-	print_screen_output "    Supported schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
-	print_screen_output "-C  Show full CPU output, including per CPU clockspeed."
-	print_screen_output "-d  Default output verbosity level, same as: $SCRIPT_NAME -v 1"
-	print_screen_output "-D  Show full hard Disk info, not only model, ie: /dev/sda ST380817AS 80.0GB."
-	print_screen_output "-f  Show all cpu flags used, not just the short list. Not shown with -F to avoid spamming."
-	print_screen_output "-F  Show Full output for $SCRIPT_NAME. Does not show extra verbose options like -f -u -l -o -p or -t"
-	print_screen_output "-G  Show Graphic card information (card, x type, resolution, glx renderer, version)."
-	print_screen_output "-i  Show Wan IP address, and shows local interfaces (requires ifconfig network tool)."
-	print_screen_output "    Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
-	print_screen_output "-I  Show Information: processes, uptime, memory, irc client, inxi version."
-	print_screen_output "-l  Show partition labels. Default: short partition -P. For full -p output, use: -pl (or -plu)."
-	print_screen_output "-N  Show Network card information."
-	print_screen_output "-o  Show unmounted partition information (includes UUID and LABEL if available)."
-	print_screen_output "    Shows file system type if you have file installed, if you are root OR if you have"
-	print_screen_output "    added to /etc/sudoers (sudo v. 1.7 or newer): <username> ALL = NOPASSWD: /usr/bin/file (sample)"
-	print_screen_output "-p  Show full partition information (-P plus all other detected partitions)."
-	print_screen_output "-P  Show Partition information (shows what -v 4 would show, but without extra data)."
-	print_screen_output "    Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted partitions."
-	print_screen_output "-r  Show distro repository data. Currently supported repo types: APT; PACMAN; PISI; YUM."
-	print_screen_output "-s  Show sensors output (if sensors installed/configured): mobo/cpu/gpu temp; detected fan speeds."
-	print_screen_output "    Gpu temp only for Fglrx/Nvidia drivers. Nvidia shows screen number for > 1 screens."
-	print_screen_output "-S  Show System information: host name, kernel, distro"
-	print_screen_output "-t  Show processes. Requires extra options: c (cpu) m (memory) cm (cpu+memory). If followed by numbers 1-20,"
-	print_screen_output "    shows that number of processes for each type (default: $PS_COUNT; if in irc, max: 5): -t cm10"
-	print_screen_output "    Make sure to have no space between letters and numbers (-t cm10 -right, -t cm 10 -wrong)."
-	print_screen_output "-u  Show partition UUIDs. Default: short partition -P. For full -p output, use: -pu (or -plu)."
-	print_screen_output "-v  Script verbosity levels. Verbosity level number is required."
-	print_screen_output "    Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME -v 4"
-	print_screen_output "    0 - short output, same as: $SCRIPT_NAME"
-	print_screen_output "    1 - basic verbose, same as: $SCRIPT_NAME -d"
-	print_screen_output "    2 - Also show networking card data"
-	print_screen_output "    3 - Also show hard disk names as detected."
-	print_screen_output "    4 - Also show partition size/filled data for (if present):/, /home, /var/, /boot"
-	print_screen_output "    5 - For multicore systems, also shows: per core clock speeds; audio card; full disk data."
-	print_screen_output "-x  Show extra data: bogomips on Cpu; driver version (if available) for Network/Audio;"
-	print_screen_output "    for network, audio cards, shows PCI Bus ID number also;"
-	print_screen_output "    direct rendering status for Graphics (in X). Only works with verbose or line output;"
-	print_screen_output "    shows (for single gpu, nvidia driver) screen number gpu is running on."
-	print_screen_output "    Shows hdd temp with disk data if you have hddtemp installed, if you are root OR if you have"
-	print_screen_output "    added to /etc/sudoers (sudo v. 1.7 or newer): <username> ALL = NOPASSWD: /usr/sbin/hddtemp (sample)"
-	print_screen_output "    For -t, adds memory use output to cpu (-tx c, and cpu use to memory (-tx m)."
-	print_screen_output ""
+	print_lines_basic "1" "-A" "Audio/sound card information."
+	print_lines_basic "1" "-b" "Basic output, short form. Like $SCRIPT_NAME^-v^2, only minus hard disk names."
+	print_lines_basic "1" "-c" "Color schemes. Scheme number is required. Color selectors run a color selector option prior to $SCRIPT_NAME starting which lets you set the config file value for the selection."
+	print_lines_basic "1" "" "Supported color schemes: 0-$color_scheme_count Example: $SCRIPT_NAME^-c^11"
+	print_lines_basic "1" "" "Color selectors for each type display (NOTE: irc and global only show safe color set):"
+# 	print_screen_output "    Supported color schemes: 0-$color_scheme_count Example: $SCRIPT_NAME -c 11"
+# 	print_screen_output "    Color selectors for each type display (NOTE: irc and global only show safe color set):"
+	print_lines_basic "2" "94" "Console, out of X"
+	print_lines_basic "2" "95" "Terminal, running in X - like xTerm"
+	print_lines_basic "2" "96" "Gui IRC, running in X - like Xchat, Quassel, Konversation etc."
+	print_lines_basic "2" "97" "Console IRC running in X - like irssi in xTerm"
+	print_lines_basic "2" "98" "Console IRC not in  X"
+	print_lines_basic "2" "99" "Global - Overrides/removes all settings. Setting specific removes global."
+	print_lines_basic "1" "-C" "CPU output, including per CPU clockspeed (if available)."
+	print_lines_basic "1" "-d" "Optical drive data. Same as -Dd. See also -x and -xx."
+	print_lines_basic "1" "-D" "Full hard Disk info, not only model, ie: /dev/sda ST380817AS 80.0GB. See also -x and -xx."
+	print_lines_basic "1" "-f" "All cpu flags, triggers -C. Not shown with -F to avoid spamming. ARM cpus show 'features'."
+	print_lines_basic "1" "-F" "Full output for $SCRIPT_NAME. Includes all Upper Case line letters, plus -s and -n. Does not show extra verbose options like -x -d -f -u -l -o -p -t -r"
+	print_lines_basic "1" "-G" "Graphic card information (card, display server type/version, resolution, glx renderer, version)."
+	print_lines_basic "1" "-i" "Wan IP address, and shows local interfaces (requires ifconfig network tool). Same as -Nni. Not shown with -F for user security reasons, you shouldn't paste your local/wan IP."
+	print_lines_basic "1" "-I" "Information: processes, uptime, memory, irc client (or shell type), $SCRIPT_NAME version."
+	print_lines_basic "1" "-l" "${partition_string_u} labels. Default: short ${partition_string} -P. For full -p output, use: -pl (or -plu)."
+	print_lines_basic "1" "-M" "Machine data. Motherboard, Bios, and if present, System Builder (Like Lenovo). Older systems/kernels without the required /sys data can use dmidecode instead, run as root."
+	print_lines_basic "1" "-n" "Advanced Network card information. Same as -Nn. Shows interface, speed, mac id, state, etc."
+	print_lines_basic "1" "-N" "Network card information. With -x, shows PCI BusID, Port number."
+	print_lines_basic "1" "-o" "Unmounted ${partition_string} information (includes UUID and LABEL if available). Shows file system type if you have file installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/bin/file^"
+	print_lines_basic "1" "-p" "Full ${partition_string} information (-P plus all other detected ${partition_string}s)."
+	print_lines_basic "1" "-P" "Basic ${partition_string} information (shows what -v 4 would show, but without extra data). Shows, if detected: / /boot /home /tmp /usr /var. Use -p to see all mounted ${partition_string}s."
+	print_lines_basic "1" "-r" "Distro repository data. Supported repo types: APT; PACMAN; PISI; YUM; URPMQ; Ports."
+	print_lines_basic "1" "-R" "RAID data. Shows RAID devices, states, levels, and components, and extra data with -x/-xx. md-raid: If device is resyncing, shows resync progress line as well."
+	print_lines_basic "1" "-s" "Sensors output (if sensors installed/configured): mobo/cpu/gpu temp; detected fan speeds. Gpu temp only for Fglrx/Nvidia drivers. Nvidia shows screen number for > 1 screens."
+	print_lines_basic "1" "-S" "System information: host name, kernel, desktop environment (if in X), distro"
+	print_lines_basic "1" "-t" "Processes. Requires extra options: c (cpu) m (memory) cm (cpu+memory). If followed by numbers 1-20, shows that number of processes for each type (default:^$PS_COUNT; if in irc, max:^5): -t^cm10"
+	print_lines_basic "1" "" "Make sure to have no space between letters and numbers (-t^cm10 - right, -t^cm^10 - wrong)."
+	print_lines_basic "1" "-u" "${partition_string_u} UUIDs. Default: short ${partition_string} -P. For full -p output, use: -pu (or -plu)."
+	print_lines_basic "1" "-v" "Script verbosity levels. Verbosity level number is required. Should not be used with -b or -F"
+	print_lines_basic "1" "" "Supported levels: 0-${VERBOSITY_LEVELS} Example: $SCRIPT_NAME^-v^4"
+	print_lines_basic "2" "0" "Short output, same as: $SCRIPT_NAME"
+	print_lines_basic "2" "1" "Basic verbose, -S + basic CPU + -G + basic Disk + -I."
+	print_lines_basic "2" "2" "Networking card (-N), Machine (-M) data, shows basic hard disk data (names only), and, if present, basic raid (devices only, and if inactive, notes that). similar to: $SCRIPT_NAME^-b"
+	print_lines_basic "2" "3" "Advanced CPU (-C), network (-n) data, and switches on -x advanced data option."
+	print_lines_basic "2" "4" "${partition_string_u} size/filled data (-P) for (if present):/, /home, /var/, /boot. Shows full disk data (-D)."
+	print_lines_basic "2" "5" "Audio card (-A); sensors (-s), ${partition_string} label (-l) and UUID (-u), short form of optical drives, standard raid data (-R)."
+	print_lines_basic "2" "6" "Full ${partition_string} (-p), unmounted ${partition_string} (-o), optical drive (-d), full raid; triggers -xx."
+	print_lines_basic "2" "7" "Network IP data (-i); triggers -xxx."
+	
+	# if distro maintainers don't want the weather feature disable it
+	if [[ $B_ALLOW_WEATHER == 'true' ]];then
+		print_lines_basic "1" "-w" "Local weather data/time. To check an alternate location, see: -W^<location>. For extra weather data options see -x, -xx, and -xxx."
+		print_lines_basic "1" "-W" "<location> Supported options for <location>: postal code; city, state/country; latitude/longitude. Only use if you want the weather somewhere other than the machine running $SCRIPT_NAME. Use only ascii characters, replace spaces in city/state/country names with '+'. Example:^$SCRIPT_NAME^-W^new+york,ny"
+	fi
+	print_lines_basic "1" "-x" "Adds the following extra data (only works with verbose or line output, not short form):"
+	print_lines_basic "2" "-C" "CPU Flags, Bogomips on Cpu;"
+	print_lines_basic "2" "-d" "Extra optical drive data; adds rev version to optical drive."
+	print_lines_basic "2" "-D" "Hdd temp with disk data if you have hddtemp installed, if you are root OR if you have added to /etc/sudoers (sudo v. 1.7 or newer) Example:^<username>^ALL^=^NOPASSWD:^/usr/sbin/hddtemp"
+	print_lines_basic "2" "-G" "Direct rendering status for Graphics (in X)."
+	print_lines_basic "2" "-G" "(for single gpu, nvidia driver) screen number gpu is running on."
+	print_lines_basic "2" "-i" "IPv6 as well for LAN interface (IF) devices."
+	print_lines_basic "2" "-I" "System GCC, default. With -xx, also show other installed GCC versions. If running in console, not in IRC client, shows shell version number, if detected. Init/RC Type and runlevel (if available)."
+	print_lines_basic "2" "-N -A" "Version/port(s)/driver version (if available) for Network/Audio;"
+	print_lines_basic "2" "-N -A -G" "Network, audio, graphics, shows PCI Bus ID/Usb ID number of card."
+	print_lines_basic "2" "-R" "md-raid: Shows component raid id. Adds second RAID Info line: raid level; report on drives (like 5/5); blocks; chunk size; bitmap (if present). Resync line, shows blocks synced/total blocks. zfs-raid: Shows raid array full size; available size; portion allocated to RAID"
+	print_lines_basic "2" "-S" "Desktop toolkit if avaliable (GNOME/XFCE/KDE only); Kernel gcc version"
+	print_lines_basic "2" "-t" "Memory use output to cpu (-xt c), and cpu use to memory (-xt m)."
+	if [[ $B_ALLOW_WEATHER == 'true' ]];then
+		print_lines_basic "2" "-w -W" "Wind speed and time zone (-w only)."
+	fi
+	print_lines_basic "1" "-xx" "Show extra, extra data (only works with verbose or line output, not short form):"
+	print_lines_basic "2" "-A" "Chip vendor:product ID for each audio device."
+	print_lines_basic "2" "-D" "Disk serial number."
+	print_lines_basic "2" "-G" "Chip vendor:product ID for each video card."
+	print_lines_basic "2" "-I" "Other detected installed gcc versions (if present). System default runlevel. Adds parent program (or tty) for shell info if not in IRC (like Konsole or Gterm). Adds Init/RC (if found) version number."
+	print_lines_basic "2" "-M" "Chassis information, bios rom size (dmidecode only), if data for either is available."
+	print_lines_basic "2" "-N" "Chip vendor:product ID for each nic."
+	print_lines_basic "2" "-R" "md-raid: Superblock (if present); algorythm, U data. Adds system info line (kernel support,read ahead, raid events). If present, adds unused device line. Resync line, shows progress bar."
+	print_lines_basic "2" "-S" "Display manager (dm) in desktop output, if in X (like kdm, gdm3, lightdm)."
+	if [[ $B_ALLOW_WEATHER == 'true' ]];then
+		print_lines_basic "2" "-w -W" "Humidity, barometric pressure."
+	fi
+	print_lines_basic "2" "-@ 11-14" "Automatically uploads debugger data tar.gz file to ftp.techpatterns.com. EG: $SCRIPT_NAME^-xx@14"
+	print_lines_basic "1" "-xxx" "Show extra, extra, extra data (only works with verbose or line output, not short form):"
+	print_lines_basic "2" "-S" "Panel/shell information in desktop output, if in X (like gnome-shell, cinnamon, mate-panel)."
+	if [[ $B_ALLOW_WEATHER == 'true' ]];then
+		print_lines_basic "2" "-w -W" "Location (uses -z/irc filter), weather observation time, wind chill, heat index, dew point (shows extra lines for data where relevant)."
+	fi
+	print_lines_basic "1" "-z" "Security filters for IP/Mac addresses, location, user home directory name. Default on for irc clients."
+	print_lines_basic "1" "-Z" "Absolute override for output filters. Useful for debugging networking issues in irc for example."
+	print_screen_output " "
 	print_screen_output "Additional Options:"
-	print_screen_output "-h - this help menu."
+	print_lines_basic "4" "-h --help" "This help menu."
+	print_lines_basic "4" "-H" "This help menu, plus developer options. Do not use dev options in normal operation!"
+	print_lines_basic "4" "--recommends" "Checks $SCRIPT_NAME application dependencies + recommends, and directories, then shows what package(s) you need to install to add support for that feature. "
 	if [[ $B_ALLOW_UPDATE == 'true' ]];then
-		print_screen_output "-U  Auto-update script. Note: if you installed as root, you"
-		print_screen_output "    must be root to update, otherwise user is fine."
-	fi
-	print_screen_output "-V  $SCRIPT_NAME version information. Prints information then exits."
-	print_screen_output "-%  Overrides defective or corrupted data."
-	print_screen_output "-@  Triggers debugger output. Requires debugging level 1-10 (8-10 - logging)."
-	print_screen_output "    8 - basic logging; 9 - full file/sys info logging; 10 - color logging."
+		print_lines_basic "4" "-U" "Auto-update script. Will also install/update man page. Note: if you installed as root, you must be root to update, otherwise user is fine. Man page installs require root user mode."
+	fi
+	print_lines_basic "4" "-V --version" "$SCRIPT_NAME version information. Prints information then exits."
+	print_screen_output " "
+	print_screen_output "Debugging Options:"
+	print_lines_basic "1" "-%" "Overrides defective or corrupted data."
+	print_lines_basic "1" "-@" "Triggers debugger output. Requires debugging level 1-14 (8-10 - logging of data). Less than 8 just triggers $SCRIPT_NAME debugger output on screen."
+	print_lines_basic "2" "1-7" "On screen debugger output"
+	print_lines_basic "2" "8" "Basic logging"
+	print_lines_basic "2" "9" "Full file/sys info logging"
+	print_lines_basic "2" "10" "Color logging."
+	print_lines_basic "1" "" "The following create a tar.gz file of system data, plus collecting the inxi output to file. To automatically upload debugger data tar.gz file to ftp.techpatterns.com: inxi^-xx@^<11-14>"
+	print_lines_basic "1" "" "For alternate ftp upload locations: Example: inxi^-!^ftp.yourserver.com/incoming^-xx@^14"
+	print_lines_basic "2" "11" "With data file of xiin read of /sys."
+	print_lines_basic "2" "12" "With xorg conf and log data, xrandr, xprop, xdpyinfo, glxinfo etc."
+	print_lines_basic "2" "13" "With data from dev, disks, ${partition_string}s, etc., plus xiin data file."
+	print_lines_basic "2" "14" "Everything, full data collection."
+	print_screen_output " "
+	print_screen_output "Advanced Options:"
+	print_lines_basic "1" "-! 31" "Turns off hostname in output. Useful if showing output from servers etc."
+	print_lines_basic "1" "-! 32" "Turns on hostname in output. Overrides global B_SHOW_HOST='false'"
+	
 	if [[ $1 == 'full' ]];then
-		print_screen_output ""
+		print_screen_output " "
 		print_screen_output "Developer and Testing Options (Advanced):"
-		print_screen_output "-! 1 - Sets testing flag B_TESTING_1='true' to trigger testing condition 1."
-		print_screen_output "-! 2 - Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
-		print_screen_output "-! 3 - Sets flags B_TESTING_1='true' and B_TESTING_2='true'."
-		print_screen_output "-! 10 - Triggers an update from the primary dev download server instead of svn."
-		print_screen_output "-! 11 - Triggers an update from svn branch one - if present, of course."
-		print_screen_output "-! 12 - Triggers an update from svn branch two - if present, of course."
-		print_screen_output "-! 13 - Triggers an update from svn branch three - if present, of course."
-		print_screen_output "-! 14 - Triggers an update from svn branch four - if present, of course."
-		print_screen_output "-! <http://......> - Triggers an update from whatever server you list."
-		print_screen_output ""
-	fi
-	print_screen_output ""
+		print_lines_basic "1" "-! 1" "Sets testing flag B_TESTING_1='true' to trigger testing condition 1."
+		print_lines_basic "1" "-! 2" "Sets testing flag B_TESTING_2='true' to trigger testing condition 2."
+		print_lines_basic "1" "-! 3" "Sets flags B_TESTING_1='true' and B_TESTING_2='true'."
+		if [[ $B_ALLOW_UPDATE == 'true' ]];then
+			print_lines_basic "1" "-! 10" "Triggers an update from the primary dev download server instead of svn."
+			print_lines_basic "1" "-! 11" "Triggers an update from svn branch one - if present, of course."
+			print_lines_basic "1" "-! 12" "Triggers an update from svn branch two - if present, of course."
+			print_lines_basic "1" "-! 13" "Triggers an update from svn branch three - if present, of course."
+			print_lines_basic "1" "-! 14" "Triggers an update from svn branch four - if present, of course."
+			print_lines_basic "1" "-! 15" "Triggers an update from svn branch BSD - if present, of course."
+			print_lines_basic "1" "-! 16" "Triggers an update from svn branch GNUBSD - if present, of course."
+			print_lines_basic "1" "-! <http://......>" "Triggers an update from whatever server you list."
+		fi
+		print_lines_basic "1" "-! <ftp.......>" "Changes debugging data ftp upload location to whatever you enter here. Only used together with -xx@^11-14, and must be used in front of that. "
+		print_lines_basic "1" "" "Example: inxi^-!^ftp.yourserver.com/incoming^-xx@^14"
+	fi
+	print_screen_output " "
 }
 
-## print out version information for -V/--version
-print_version_info()
+# uses $TERM_COLUMNS to set width using $COLS_MAX as max width
+# IMPORTANT: minimize use of subshells here or the output is too slow
+# args: $1 - 0 1 2 3 4 for indentation level; $2 -line starter, like -m; $3 - content of block.
+print_lines_basic()
 {
-	local last_modified=$( grep -im 1 'date:' $SCRIPT_PATH/$SCRIPT_NAME | gawk '{print $3,$4,$5}' )
-
-	print_screen_output "$SCRIPT_NAME - the universal, portable, system info script for irc."
-	print_screen_output "Version: $SCRIPT_VERSION_NUMBER"
-	print_screen_output "Script Last Modified: $last_modified"
-	print_screen_output "Script Location: $SCRIPT_PATH"
-	print_screen_output ""
-	print_screen_output "Tested with Irssi, Xchat, Konversation, BitchX, KSirc, ircII,"
-	print_screen_output "Gaim/Pidgin, Weechat, KVIrc and Kopete."
-	print_screen_output ""
-	print_screen_output "This script is a fork of Infobash 3.02, which is:"
-	print_screen_output "Copyright (C) 2005-2007  Michiel de Boer a.k.a. locsmif"
-	print_screen_output "Subsequent changes and modifications (after Infobash 3.02) are:"
-	print_screen_output "Copyright (C) 2008-10 Scott Rogers, Harald Hope, aka trash80 & h2"
-	print_screen_output ""
-	print_screen_output "This program is free software; you can redistribute it and/or modify"
-	print_screen_output "it under the terms of the GNU General Public License as published by"
-	print_screen_output "the Free Software Foundation; either version 3 of the License, or"
-	print_screen_output "(at your option) any later version."
-}
-
-########################################################################
-#### MAIN FUNCTIONS
-########################################################################
-
-#### -------------------------------------------------------------------
-#### initial startup stuff
-#### -------------------------------------------------------------------
+	local line_width=$COLS_MAX
+	local print_string='' indent_inner='' indent_full='' indent_x='' 
+	local indent_working='' indent_working_full=''
+	local line_starter='' line_1_starter='' line_x_starter='' 
+	# note: to create a padded string below
+	local fake_string=' ' temp_count='' line_count='' spacer=''
+	local indent_main=6 indent_x='' b_indent_x='true' 
+	
+	case $1 in
+		# for no options, start at left edge
+		0)	indent_full=0
+			line_1_starter=''
+			line_x_starter=''
+			b_indent_x='false'
+			;;
+		1)	indent_full=$indent_main
+			temp_count=${#2}
+			if [[ $temp_count -le $indent_full ]];then
+				indent_working=$indent_full
+			else
+				indent_working=$temp_count #$(( $temp_count + 1 ))
+			fi
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
+			;;
+		# first left pad 2 and 3, then right pad them
+		2)	indent_full=$(( $indent_main + 6 ))
+			indent_inner=3
+			temp_count=${#2}
+			if [[ $temp_count -le $indent_inner ]];then
+				indent_working=$indent_inner
+				#indent_working_full=$indent_full
+			else
+				indent_working=$(( $temp_count + 1 ))
+				#indent_working_full=$(( $indent_full - $indent_inner - 1 ))
+			fi
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_full\}$/ &/;ta" <<< "$line_1_starter" )"
+			;;
+		3)	indent_full=$(( $indent_main + 8 ))
+			indent_inner=3
+			temp_count=${#2}
+			if [[ $temp_count -le $indent_inner ]];then
+				indent_working=$indent_inner
+			else
+				indent_working=$(( $temp_count + 1 ))
+			fi
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_full\}$/ &/;ta" <<< "$line_1_starter" )"
+			;;
+		# for long options
+		4)	indent_full=$(( $indent_main + 8 ))
+			temp_count=${#2}
+			if [[ $temp_count -lt $indent_full ]];then
+				indent_working=$indent_full
+			else
+				indent_working=$temp_count #$(( $temp_count + 1 ))
+			fi
+			line_1_starter="$( sed -e :a -e "s/^.\{1,$indent_working\}$/& /;ta" <<< $2 )"
+			;;
+	esac
+	
+	if [[ $b_indent_x == 'true' ]];then
+		indent_x=$(( $indent_full + 1 ))
+		line_x_starter="$(printf "%${indent_x}s" '')"
+	fi
+	
+	line_count=$(( $line_width - $indent_full ))
+	
+	# bash loop is slow, only run this if required
+	if [[ ${#3} -gt $line_count ]];then
+		for word in $3
+		do
+			temp_string="$print_string$spacer$word"
+			spacer=' '
+			if [[ ${#temp_string} -lt $line_count ]];then
+				print_string=$temp_string # lose any white space start/end
+				# echo -n $(( $line_width - $indent_full ))
+			else
+				if [[ -n $line_1_starter ]];then
+					line_starter="$line_1_starter"
+					line_1_starter=''
+				else
+					line_starter="$line_x_starter"
+				fi
+				# clean up forced connections, ie, stuff we don't want wrapping
+				print_string=${print_string//\^/ }
+				print_screen_output "$line_starter$print_string"
+				print_string="$word$spacer" # needed to handle second word on new line
+				temp_string=''
+				spacer=''
+			fi
+		done
+	else
+		# echo no loop
+		print_string=$3
+	fi
+	# print anything left over
+	if [[ -n $print_string ]];then
+		if [[ -n $line_1_starter ]];then
+			line_starter="$line_1_starter"
+			line_1_starter=''
+		else
+			line_starter="$line_x_starter"
+		fi
+		print_string=${print_string//\^/ }
+		print_screen_output "$line_starter$print_string"
+	fi
+}
+# print_lines_basic '1' '-m' 'let us teest this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
+# print_lines_basic '2' '7' 'and its substring this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
+# print_lines_basic '2' '12' 'and its sss substring'
+# print_lines_basic '3' '12' 'and its sss substring this string and lots more and stuff and more stuff and x is wy and z is x and fred is dead and gus is alive an yes we have to go now'
+# exit
+
+## print out version information for -V/--version
+print_version_info()
+{
+	# if not in PATH could be either . or directory name, no slash starting
+	local script_path=$SCRIPT_PATH script_symbolic_start=''
+	if [[ $script_path == '.' ]];then
+		script_path=$( pwd )
+	elif [[ -z $( grep '^/' <<< "$script_path" ) ]];then
+		script_path="$( pwd )/$script_path"
+	fi
+	# handle if it's a symbolic link, rare, but can happen with script directories in irc clients
+	# which would only matter if user starts inxi with -! 30 override in irc client
+	if [[ -L $script_path/$SCRIPT_NAME ]];then
+		script_symbolic_start=$script_path/$SCRIPT_NAME
+		script_path=$( readlink $script_path/$SCRIPT_NAME )
+		script_path=$( dirname $script_path )
+	fi
+	local last_modified=$( parse_version_data 'date' ) 
+	local year_modified=$( gawk '{print $NF}' <<< "$last_modified" )
+	
+	print_screen_output "$SCRIPT_NAME $SCRIPT_VERSION_NUMBER-$SCRIPT_PATCH_NUMBER ($last_modified)"
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
+		print_screen_output "Program Location: $script_path"
+		if [[ -n $script_symbolic_start ]];then
+			print_screen_output "Started via symbolic link: $script_symbolic_start"
+		fi
+		print_lines_basic "0" "" "Website:^http://inxi.goooglecode.com"
+		print_lines_basic "0" "" "IRC:^irc.oftc.net channel:^#smxi"
+		print_lines_basic "0" "" "Forums:^http://techpatterns.com/forums/forum-33.html"
+		print_screen_output " "
+		print_lines_basic "0" "" "$SCRIPT_NAME - the universal, portable, system information tool for console and irc."
+		print_screen_output " "
+		print_lines_basic "0" "" "This program started life as a fork of Infobash 3.02: Copyright (C) 2005-2007  Michiel de Boer a.k.a. locsmif."
+		print_lines_basic "0" "" "Subsequent changes and modifications (after Infobash 3.02): Copyright (C) 2008-$year_modified Scott Rogers, Harald Hope, aka trash80 & h2"
+		print_screen_output " "
+		print_lines_basic "0" "" "This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 3 of the License, or (at your option) any later version. (http://www.gnu.org/licenses/gpl.html)"
+	fi
+}
+
+########################################################################
+#### MAIN FUNCTIONS
+########################################################################
+
+#### -------------------------------------------------------------------
+#### initial startup stuff
+#### -------------------------------------------------------------------
 
 # Determine where inxi was run from, set IRC_CLIENT and IRC_CLIENT_VERSION
 get_start_client()
 {
 	eval $LOGFS
-	local irc_client_path='' irc_client_path_lower='' non_native_konvi='' i=''
-	local b_non_native_app='false' pppid='' app_working_name=''
-	local b_qt4_konvi='false'
+	local Irc_Client_Path='' irc_client_path_lower='' non_native_konvi='' i=''
+	local B_Non_Native_App='false' pppid='' App_Working_Name=''
+	local b_qt4_konvi='false' ps_parent=''
 
-	if tty >/dev/null;then
+	if [[ $B_RUNNING_IN_SHELL == 'true' ]];then
 		IRC_CLIENT='Shell'
 		unset IRC_CLIENT_VERSION
-		B_RUNNING_IN_SHELL='true'
+	# elif [[ -n $PPID ]];then
 	elif [[ -n $PPID && -f /proc/$PPID/exe ]];then
-		irc_client_path=$( readlink /proc/$PPID/exe )
-		irc_client_path_lower=$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )
-		app_working_name=$( basename $irc_client_path_lower )
+		if [[ $B_OVERRIDE_FILTER != 'true' ]];then
+			B_OUTPUT_FILTER='true'
+		fi
+		Irc_Client_Path=$( readlink /proc/$PPID/exe )
+		# Irc_Client_Path=$( ps -p $PPID | gawk '!/[[:space:]]*PID/ {print $5}'  )
+		# echo $( ps -p $PPID )
+		irc_client_path_lower=$( tr '[:upper:]' '[:lower:]' <<< $Irc_Client_Path )
+		App_Working_Name=$( basename $irc_client_path_lower )
 		# handles the xchat/sh/bash/dash cases, and the konversation/perl cases, where clients
 		# report themselves as perl or unknown shell. IE:  when konversation starts inxi
 		# from inside itself, as a script, the parent is konversation/xchat, not perl/bash etc
 		# note: perl can report as: perl5.10.0, so it needs wildcard handling
-		case $app_working_name in
-			bash|dash|sh|perl*)	# We want to know who wrapped it into the shell or perl.
-				pppid="$( ps -p $PPID -o ppid --no-headers | sed 's/ //g' )"
+		case $App_Working_Name in
+			# bsd will never use this section
+			bash|dash|sh|python*|perl*)	# We want to know who wrapped it into the shell or perl.
+				pppid="$( ps -p $PPID -o ppid --no-headers | sed 's/[[:space:]]//g' )"
 				if [[ -n $pppid && -f /proc/$pppid/exe ]];then
-					irc_client_path="$( readlink /proc/$pppid/exe )"
-					irc_client_path_lower="$( tr '[:upper:]' '[:lower:]' <<< $irc_client_path )"
-					app_working_name=$( basename $irc_client_path_lower )
-					b_non_native_app='true'
-				fi
-				;;
-		esac
-		# replacing loose detection with tight detection, bugs will be handled with app names
-		# as they appear.
-		case $app_working_name in
-			# check for shell first
-			bash|dash|sh)
-				unset IRC_CLIENT_VERSION
-				IRC_CLIENT="Shell wrapper"
-				;;
-			# now start on irc clients, alphabetically
-			bitchx)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
-				/Version/ {
-					a=tolower($2)
-					gsub(/[()]|bitchx-/,"",a)
-					print a
-					exit
-				}
-				$2 == "version" {
-					a=tolower($3)
-					sub(/bitchx-/,"",a)
-					print a
-					exit
-				}' )"
-				IRC_CLIENT="BitchX"
-				;;
-			finch)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="Finch"
-				;;
-			gaim)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="Gaim"
-				;;
-			ircii)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $3
-				}' )"
-				IRC_CLIENT="ircII"
-				;;
-			irssi-text|irssi)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="Irssi"
-				;;
-			konversation) ## konvi < 1.2 (qt4)
-				# this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
-				if [[ $b_non_native_app == 'true' ]];then  ## true negative is confusing
-					KONVI=2
-				else # if native app
-					KONVI=1
-				fi
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk '
-				/Konversation:/ {
-					for ( i=2; i<=NF; i++ ) {
-						if (i == NF) {
-							print $i
-						}
-						else {
-							printf $i" "
-						}
-					}
-					exit
-				}' )"
-
-				T=($IRC_CLIENT_VERSION)
-				if [[ ${T[0]} == *+* ]];then
-					# < Sho_> locsmif: The version numbers of SVN versions look like this:
-					#         "<version number of last release>+ #<build number", i.e. "1.0+ #3177" ...
-					#         for releases we remove the + and build number, i.e. "1.0" or soon "1.0.1"
-					IRC_CLIENT_VERSION=" CVS $IRC_CLIENT_VERSION"
-					T2="${T[0]/+/}"
-				else
-					IRC_CLIENT_VERSION=" ${T[0]}"
-					T2="${T[0]}"
-				fi
-				# Remove any dots except the first, and make sure there are no trailing zeroes,
-				T2=$( echo "$T2" | gawk '{
-					sub(/\./, " ")
-					gsub(/\./, "")
-					sub(/ /, ".")
-					printf("%g\n", $0)
-				}' )
-				# Since Konversation 1.0, the DCOP interface has changed a bit: dcop "$DCPORT" Konversation ..etc
-				# becomes : dcop "$DCPORT" default ... or dcop "$DCPORT" irc ..etc. So we check for versions smaller
-				# than 1 and change the DCOP parameter/object accordingly.
-				if [[ ${T2} -lt 1 ]];then
-					DCOPOBJ="Konversation"
-				fi
-				IRC_CLIENT="Konversation"
-				;;
-			kopete)
-				IRC_CLIENT_VERSION=" $( kopete -v | gawk '
-				/Kopete:/ {
-					print $2
-					exit
-				}' )"
-				IRC_CLIENT="Kopete"
-				;;
-			kvirc)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v 2>&1 | gawk '{
-					for ( i=2; i<=NF; i++) {
-				 		if ( i == NF ) {
-				 			print $i
-				 		}
-				 		else {
-				 			printf $i" "
-				 		}
-				 	}
-				 	exit
-				 }' )"
-				IRC_CLIENT="KVIrc"
-				;;
-			pidgin)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="Pidgin"
-				;;
-			quassel*)
-				# sample: quassel -v
-				# Qt: 4.5.0
-				# KDE: 4.2.65 (KDE 4.2.65 (KDE 4.3 >= 20090226))
-				# Quassel IRC: v0.4.0 [+60] (git-22effe5)
-				# note: early < 0.4.1 quassels do not have -v
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v 2>/dev/null | gawk -F ': ' '
-				BEGIN {
-					IGNORECASE=1
-					clientVersion=""
-				}
-				/Quassel IRC/ {
-					clientVersion = $2
-				}
-				END {
-					# this handles pre 0.4.1 cases with no -v
-					if ( clientVersion == "" ) {
-						clientVersion = "(pre v0.4.1)"
-					}
-					print clientVersion
-				}' )"
-				# now handle primary, client, and core. quasselcore doesn't actually
-				# handle scripts with exec, but it's here just to be complete
-				case $app_working_name in
-					quassel)
-						IRC_CLIENT="Quassel [M]"
-						;;
-					quasselclient)
-						IRC_CLIENT="Quassel"
-						;;
-					quasselcore)
-						IRC_CLIENT="Quassel (core)"
-						;;
-				esac
-				;;
-			weechat-curses)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v ) "
-				IRC_CLIENT="Weechat"
-				;;
-			xchat-gnome)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="X-Chat-Gnome"
-				;;
-			xchat)
-				IRC_CLIENT_VERSION=" $( $irc_client_path -v | gawk 'NR == 1 {
-					print $2
-				}' )"
-				IRC_CLIENT="X-Chat"
-				;;
-			# then do some perl type searches, do this last since it's a wildcard search
-			perl*|ksirc|dsirc)
-				unset IRC_CLIENT_VERSION
-				# KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
-				get_cmdline $PPID
-				for (( i=0; i <= $CMDL_MAX; i++ ))
-				do
-					case ${A_CMDL[i]} in
-						*dsirc*)
-						IRC_CLIENT="KSirc"
-						# 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
-						# with one parameter which contains parameters separated by spaces(??), first param being KSirc.
-						# Then, KSirc runs dsirc as the perl irc script and wraps around it. When /exec is executed,
-						# dsirc is the program that runs inxi, therefore that is the parent process that we see.
-						# You can imagine how hosed I am if I try to make inxi find out dynamically with which path
-						# KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
-						# (KSirc sucks anyway ;)
-						IRC_CLIENT_VERSION=" $( ksirc -v | gawk '
-						/KSirc:/ {
-							print $2
-							exit
-						}' )"
-						break
-						;;
-					esac
-				done
-				if [[ -z $IRC_CLIENT_VERSION ]];then
-					IRC_CLIENT="Unknown Perl client"
+					Irc_Client_Path="$( readlink /proc/$pppid/exe )"
+					irc_client_path_lower="$( tr '[:upper:]' '[:lower:]' <<< $Irc_Client_Path )"
+					App_Working_Name=$( basename $irc_client_path_lower )
+					B_Non_Native_App='true'
 				fi
 				;;
-			# then unset, set unknown data
-			*)	
-				IRC_CLIENT="Unknown : ${irc_client_path##*/}"
-				unset IRC_CLIENT_VERSION
-				;;
 		esac
-		if [[ $SHOW_IRC -lt 2 ]];then
-			unset IRC_CLIENT_VERSION
-		fi
+		# sets version number if it can find it
+		get_irc_client_version
 	else
 		## lets look to see if qt4_konvi is the parent.  There is no direct way to tell, so lets infer it.
 		## because $PPID does not work with qt4_konvi, the above case does not work
+		if [[ $B_OVERRIDE_FILTER != 'true' ]];then
+			B_OUTPUT_FILTER='true'
+		fi
 		b_qt4_konvi=$( is_this_qt4_konvi )
 		if [[ $b_qt4_konvi == 'true' ]];then
 			KONVI=3
@@ -1610,13 +2877,303 @@ get_start_client()
 					exit
 				}' )"
 		else
-			IRC_CLIENT="PPID=\"$PPID\" - empty?"
-			unset IRC_CLIENT_VERSION
+			# this should handle certain cases where it's ssh or some other startup tool
+			# that falls through all the other tests
+			if [[ $BSD_TYPE != 'bsd' ]];then
+				App_Working_Name=$(ps -p $PPID --no-headers 2>/dev/null | gawk '{print $NF}' )
+			else
+				# without --no-headers we need the second line
+				App_Working_Name=$(ps -p $PPID 2>/dev/null | gawk '/^[0-9]+/ {print $5}' )
+			fi
+			
+			if [[ -n $App_Working_Name ]];then
+				Irc_Client_Path=$App_Working_Name
+				B_Non_Native_App='false'
+				get_irc_client_version
+				if [[ -z $IRC_CLIENT ]];then
+					IRC_CLIENT=$App_Working_Name
+				fi
+			else
+				IRC_CLIENT="PPID=\"$PPID\" - empty?"
+				unset IRC_CLIENT_VERSION
+			fi
 		fi
 	fi
+
 	log_function_data "IRC_CLIENT: $IRC_CLIENT :: IRC_CLIENT_VERSION: $IRC_CLIENT_VERSION :: PPID: $PPID"
 	eval $LOGFE
 }
+# note: all variables set in caller so no need to pass
+get_irc_client_version()
+{
+	local file_data=''
+	# replacing loose detection with tight detection, bugs will be handled with app names
+	# as they appear.
+	case $App_Working_Name in
+		# check for shell first
+		bash|dash|sh)
+			unset IRC_CLIENT_VERSION
+			IRC_CLIENT="Shell wrapper"
+			;;
+		# now start on irc clients, alphabetically
+		bitchx)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk '
+			/Version/ {
+				a=tolower($2)
+				gsub(/[()]|bitchx-/,"",a)
+				print a
+				exit
+			}
+			$2 == "version" {
+				a=tolower($3)
+				sub(/bitchx-/,"",a)
+				print a
+				exit
+			}' )"
+			B_CONSOLE_IRC='true'
+			IRC_CLIENT="BitchX"
+			;;
+		finch)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			B_CONSOLE_IRC='true'
+			IRC_CLIENT="Finch"
+			;;
+		gaim)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			IRC_CLIENT="Gaim"
+			;;
+		hexchat)
+			# the hexchat author decided to make --version/-v return a gtk dialogue box, lol...
+			# 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 use edited, doing some extra checks here.
+			if [[ -f ~/.config/hexchat/hexchat.conf ]];then
+				file_data="$( cat ~/.config/hexchat/hexchat.conf )"
+			elif [[ -f  ~/.config/hexchat/xchat.conf ]];then
+				file_data="$( cat ~/.config/hexchat/xchat.conf )"
+			fi
+			if [[ -n $file_data ]];then
+				IRC_CLIENT_VERSION=$( gawk '
+				BEGIN {
+					IGNORECASE=1
+					FS="="
+				}
+				/^[[:space:]]*version/ {
+					# get rid of the space if present
+					gsub(/[[:space:]]*/, "", $2 )
+					print $2
+					exit # usually this is the first line, no point in continuing
+				}' <<< "$file_data" )
+				
+				IRC_CLIENT_VERSION=" $IRC_CLIENT_VERSION"
+			else
+				IRC_CLIENT_VERSION=' N/A'
+			fi
+			IRC_CLIENT="HexChat"
+			;;
+		ircii)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $3
+			}' )"
+			B_CONSOLE_IRC='true'
+			IRC_CLIENT="ircII"
+			;;
+		irssi-text|irssi)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			B_CONSOLE_IRC='true'
+			IRC_CLIENT="Irssi"
+			;;
+		konversation) ## konvi < 1.2 (qt4)
+			# this is necessary to avoid the dcop errors from starting inxi as a /cmd started script
+			if [[ $B_Non_Native_App == 'true' ]];then  ## true negative is confusing
+				KONVI=2
+			else # if native app
+				KONVI=1
+			fi
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk '
+			/Konversation:/ {
+				for ( i=2; i<=NF; i++ ) {
+					if (i == NF) {
+						print $i
+					}
+					else {
+						printf $i" "
+					}
+				}
+				exit
+			}' )"
+
+			T=($IRC_CLIENT_VERSION)
+			if [[ ${T[0]} == *+* ]];then
+				# < Sho_> locsmif: The version numbers of SVN versions look like this:
+				#         "<version number of last release>+ #<build number", i.e. "1.0+ #3177" ...
+				#         for releases we remove the + and build number, i.e. "1.0" or soon "1.0.1"
+				IRC_CLIENT_VERSION=" CVS $IRC_CLIENT_VERSION"
+				T2="${T[0]/+/}"
+			else
+				IRC_CLIENT_VERSION=" ${T[0]}"
+				T2="${T[0]}"
+			fi
+			# Remove any dots except the first, and make sure there are no trailing zeroes,
+			T2=$( echo "$T2" | gawk '{
+				sub(/\./, " ")
+				gsub(/\./, "")
+				sub(/ /, ".")
+				printf("%g\n", $0)
+			}' )
+			# Since Konversation 1.0, the DCOP interface has changed a bit: dcop "$DCPORT" Konversation ..etc
+			# becomes : dcop "$DCPORT" default ... or dcop "$DCPORT" irc ..etc. So we check for versions smaller
+			# than 1 and change the DCOP parameter/object accordingly.
+			if [[ ${T2} -lt 1 ]];then
+				DCOPOBJ="Konversation"
+			fi
+			IRC_CLIENT="Konversation"
+			;;
+		kopete)
+			IRC_CLIENT_VERSION=" $( kopete -v | gawk '
+			/Kopete:/ {
+				print $2
+				exit
+			}' )"
+			IRC_CLIENT="Kopete"
+			;;
+		kvirc)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v 2>&1 | gawk '{
+				for ( i=2; i<=NF; i++) {
+					if ( i == NF ) {
+						print $i
+					}
+					else {
+						printf $i" "
+					}
+				}
+				exit
+				}' )"
+			IRC_CLIENT="KVIrc"
+			;;
+		pidgin)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			IRC_CLIENT="Pidgin"
+			;;
+		quassel*)
+			# sample: quassel -v
+			# Qt: 4.5.0
+			# KDE: 4.2.65 (KDE 4.2.65 (KDE 4.3 >= 20090226))
+			# Quassel IRC: v0.4.0 [+60] (git-22effe5)
+			# note: early < 0.4.1 quassels do not have -v
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v 2>/dev/null | gawk -F ': ' '
+			BEGIN {
+				IGNORECASE=1
+				clientVersion=""
+			}
+			/Quassel IRC/ {
+				clientVersion = $2
+			}
+			END {
+				# this handles pre 0.4.1 cases with no -v
+				if ( clientVersion == "" ) {
+					clientVersion = "(pre v0.4.1)"
+				}
+				print clientVersion
+			}' )"
+			# now handle primary, client, and core. quasselcore doesn't actually
+			# handle scripts with exec, but it's here just to be complete
+			case $App_Working_Name in
+				quassel)
+					IRC_CLIENT="Quassel [M]"
+					;;
+				quasselclient)
+					IRC_CLIENT="Quassel"
+					;;
+				quasselcore)
+					IRC_CLIENT="Quassel (core)"
+					;;
+			esac
+			;;
+		weechat-curses)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v ) "
+			B_CONSOLE_IRC='true'
+			IRC_CLIENT="Weechat"
+			;;
+		xchat-gnome)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			IRC_CLIENT="X-Chat-Gnome"
+			;;
+		xchat)
+			IRC_CLIENT_VERSION=" $( $Irc_Client_Path -v | gawk 'NR == 1 {
+				print $2
+			}' )"
+			IRC_CLIENT="X-Chat"
+			;;
+		# then do some perl type searches, do this last since it's a wildcard search
+		perl*|ksirc|dsirc)
+			unset IRC_CLIENT_VERSION
+			# KSirc is one of the possibilities now. KSirc is a wrapper around dsirc, a perl client
+			get_cmdline $PPID
+			for (( i=0; i <= $CMDL_MAX; i++ ))
+			do
+				case ${A_CMDL[i]} in
+					*dsirc*)
+					IRC_CLIENT="KSirc"
+					# 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
+					# with one parameter which contains parameters separated by spaces(??), first param being KSirc.
+					# Then, KSirc runs dsirc as the perl irc script and wraps around it. When /exec is executed,
+					# dsirc is the program that runs inxi, therefore that is the parent process that we see.
+					# You can imagine how hosed I am if I try to make inxi find out dynamically with which path
+					# KSirc was run by browsing up the process tree in /proc. That alone is straightjacket material.
+					# (KSirc sucks anyway ;)
+					IRC_CLIENT_VERSION=" $( ksirc -v | gawk '
+					/KSirc:/ {
+						print $2
+						exit
+					}' )"
+					break
+					;;
+				esac
+			done
+			B_CONSOLE_IRC='true'
+			set_perl_python_konvi "$App_Working_Name"
+			;;
+		python*)
+			# B_CONSOLE_IRC='true' # are there even any python type console irc clients? check.
+			set_perl_python_konvi "$App_Working_Name"
+			;;
+		# then unset, set unknown data
+		*)	
+			IRC_CLIENT="Unknown : ${Irc_Client_Path##*/}"
+			unset IRC_CLIENT_VERSION
+			;;
+	esac
+	if [[ $SHOW_IRC -lt 2 ]];then
+		unset IRC_CLIENT_VERSION
+	fi
+}
+
+# args: $1 - App_Working_Name
+set_perl_python_konvi()
+{
+	if [[ -z $IRC_CLIENT_VERSION ]];then
+		# this is a hack to try to show konversation if inxi is running but started via /cmd
+		if [[ -n $( grep -i 'konversation' <<< "$Ps_aux_Data" | grep -v 'grep' ) && $B_RUNNING_IN_DISPLAY == 'true' ]];then
+			IRC_CLIENT='Konversation'
+			IRC_CLIENT_VERSION=" $( konversation --version 2>/dev/null | gawk '/^Konversation/ {print $2}' )"
+			B_CONSOLE_IRC='false'
+		else
+			IRC_CLIENT="Unknown $1 client"
+		fi
+	fi
+}
 
 ## try to infer the use of Konversation >= 1.2, which shows $PPID improperly
 ## no known method of finding Kovni >= 1.2 as parent process, so we look to see if it is running,
@@ -1625,19 +3182,22 @@ is_this_qt4_konvi()
 {
 	local konvi_qt4_client='' konvi_dbus_exist='' konvi_pid='' konvi_home_dir='' 
 	local konvi='' konvi_qt4_ver='' b_is_qt4=''
-
-	konvi_dbus_exist=$( qdbus | grep "org.kde.konversation" )
-	 
-	if [[ -n $konvi_dbus_exist && -e /usr/share/kde4/apps/konversation ]]; then
-		konvi_pid=$( ps -A | grep -i 'konversation' )
-		konvi_pid=$( echo $konvi_pid | gawk '{ print $1 }' ) 
+	
+	# fringe cases can throw error, always if untested app, use 2>/dev/null after testing if present
+	if [[ $B_QDBUS == 'true' ]];then
+		konvi_dbus_exist=$( qdbus 2>/dev/null | grep "org.kde.konversation" )
+	fi
+	# sabayon uses /usr/share/apps/konversation as path
+	if [[ -n $konvi_dbus_exist ]] && [[ -e /usr/share/kde4/apps/konversation || -e  /usr/share/apps/konversation ]]; then
+		konvi_pid=$( ps -A | gawk 'BEGIN{IGNORECASE=1} /konversation/ { print $1 }' ) 
 		konvi_home_dir=$( readlink /proc/$konvi_pid/exe )
 		konvi=$( echo $konvi_home_dir | sed "s/\// /g" )
 		konvi=($konvi)
 
 		if [[ ${konvi[2]} == 'konversation' ]];then	
 			konvi_qt4_ver=$( konversation -v | grep -i 'konversation' )
-			konvi_qt4_client=$( echo "$konvi_qt4_ver" | gawk '{ print $2 }' )
+			# note: we need to change this back to a single dot number, like 1.3, not 1.3.2
+			konvi_qt4_client=$( echo "$konvi_qt4_ver" | gawk '{ print $2 }' | cut -d '.' -f 1,2 )
 
 			if [[ $konvi_qt4_client > 1.1 ]]; then
 				b_is_qt4='true'
@@ -1647,7 +3207,7 @@ is_this_qt4_konvi()
 		konvi_qt4="qt3"
 		b_is_qt4='false'
 	fi
-
+	log_function_data "b_is_qt4: $b_is_qt4"
 	echo $b_is_qt4
 	## for testing this module
 	#qdbus org.kde.konversation /irc say $1 $2 "getpid_dir: $konvi_qt4  qt4_konvi: $konvi_qt4_ver   verNum: $konvi_qt4_ver_num  pid: $konvi_pid ppid: $PPID  konvi_home_dir: ${konvi[2]}"
@@ -1692,40 +3252,39 @@ get_cmdline()
 get_audio_data()
 {
 	eval $LOGFS
-	local i='' alsa_data='' alsa_driver='' device_count='' lsusb_path=''
-	local usb_proc_file='' array_count='' usb_id='' usb_data=''
+	local i='' alsa_data='' audio_driver='' device_count='' temp_array=''
 
 	IFS=$'\n'
 	# this first step handles the drivers for cases where the second step fails to find one
-	device_count=$( echo "$Lspci_Data" | egrep -ic '(multimedia audio controller|audio device)' )
+	device_count=$( echo "$Lspci_v_Data" | grep -iEc '(multimedia audio controller|audio device)' )
 	if [[ $device_count -eq 1 ]] && [[ $B_ASOUND_DEVICE_FILE == 'true' ]];then
-		alsa_driver=$( gawk -F ']: ' '
+		audio_driver=$( gawk -F ']: ' '
 		BEGIN {
 			IGNORECASE=1
 		}
 		# filtering out modems and usb devices like webcams, this might get a
 		# usb audio card as well, this will take some trial and error
-		$0 !~ /modem/ || $0 !~ /usb/ {
+		$0 !~ /modem|usb|webcam/ {
 			driver=gensub( /^(.+)( - )(.+)$/, "\\1", 1, $2 )
 			gsub(/^ +| +$/,"",driver)
 			if ( driver != "" ){
 				print driver
 			}
-		}'  $FILE_ASOUND_DEVICE )
+		}' $FILE_ASOUND_DEVICE ) 
 		log_function_data 'cat' "$FILE_ASOUND_DEVICE"
 	fi
 
 	# this is to safeguard against line breaks from results > 1, which if inserted into following
 	# array will create a false array entry. This is a hack, not a permanent solution.
-	alsa_driver=$( echo $alsa_driver )
+	audio_driver=$( echo $audio_driver )
 	# now we'll build the main audio data, card name, driver, and port. If no driver is found,
 	# and if the first method above is not null, and one card is found, it will use that instead.
-	A_AUDIO_DATA=( $( echo "$Lspci_Data" | gawk -F ': ' -v alsaDriver="$alsa_driver" '
+	A_AUDIO_DATA=( $( echo "$Lspci_v_Data" | gawk -F ': ' -v audioDriver="$audio_driver" '
 	BEGIN {
 		IGNORECASE=1
 	}
 	/multimedia audio controller|audio device/ {
-		audioCard=gensub(/^[0-9a-f:.]+ [^:]+: (.+)$/,"\\1","g",$0)
+		audioCard=gensub(/^[0-9a-f:\.]+ [^:]+: (.+)$/,"\\1","g",$0)
 		# The doublequotes are necessary because of the pipes in the variable.
 		gsub(/'"$BAN_LIST_NORMAL"'/, "", audioCard)
 		gsub(/,/, " ", audioCard)
@@ -1771,8 +3330,8 @@ get_audio_data()
 				if (drivers[i] != "") {
 					useDrivers=drivers[i]
 				}
-				else if ( alsaDriver != "" ) {
-					useDrivers=alsaDriver
+				else if ( audioDriver != "" ) {
+					useDrivers=audioDriver
 				}
 			}
 			if (ports[i] != "") {
@@ -1803,73 +3362,115 @@ get_audio_data()
 			if ( card != "" ){
 				print card","driver
 			}
-		}'  $FILE_ASOUND_DEVICE ) )
+		}' $FILE_ASOUND_DEVICE ) )
 	fi
-
-	# alsa usb detection by damentz
-	# for every sound card symlink in /proc/asound - display information about it
-	lsusb_path=$( type -p lsusb )
-	for usb_proc_file in /proc/asound/*
-	do
-		# if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
-		if [[ -n $lsusb_path && -L $usb_proc_file && -e $usb_proc_file/usbid  ]]; then
-			# send error messages of lsusb to /dev/null as it will display a bunch if not a super user
-			# also, find the contents of usbid in lsusb and print everything after the 7th word on the
-			# corresponding line. Finally, strip out commas as they will change the driver :)
-			usb_id=$( cat $usb_proc_file/usbid )
-			usb_data=$( $lsusb_path -v 2>/dev/null | grep "$usb_id" )
-			log_function_data 'raw' "usb_data:\n$usb_data"
-			usb_data=$( gawk '{
-				gsub( /,/, " ", $0 )
-				for( i=7; i <= NF; i++ ) {
-					printf( $i " " )
-				}
-			}' <<< "$usb_data" )
-			# this method is interesting, it shouldn't work but it does
-			#A_AUDIO_DATA=( "${A_AUDIO_DATA[@]}" "$usb_data,snd-usb-audio,," )
-			# but until we learn why the above worked, I'm using this one, which is safer
-			if [[ -n $usb_data ]];then
-				array_count=${#A_AUDIO_DATA[@]}
-				A_AUDIO_DATA[$array_count]="$usb_data,snd-usb-audio,,"
-			fi
-		fi
-	done
 	IFS="$ORIGINAL_IFS"
-
+	get_audio_usb_data
 	# handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
 	if [[ ${#A_AUDIO_DATA[@]} -eq 0 ]];then
 		A_AUDIO_DATA[0]='Failed to Detect Sound Card!'
 	fi
-	log_function_data "A_AUDIO_DATA: ${A_AUDIO_DATA[@]}"
+	temp_array=${A_AUDIO_DATA[@]}
+	log_function_data "A_AUDIO_DATA: $temp_array"
+
 	eval $LOGFE
 }
+# alsa usb detection by damentz
 
-get_audio_alsa_data()
+get_audio_usb_data()
 {
 	eval $LOGFS
-	local alsa_data=''
-
-	# now we'll get the alsa data if the file exists
-	if [[ $B_ASOUND_VERSION_FILE == 'true' ]];then
-		alsa_data=$( gawk '
-			BEGIN {
-				IGNORECASE=1
-			}
+	local usb_proc_file='' array_count='' usb_data='' usb_id='' lsusb_path='' lsusb_data=''
+	local temp_array=''
+	
+	IFS=$'\n'
+	lsusb_path=$( type -p lsusb )
+	if [[ -n $lsusb_path ]];then
+		lsusb_data=$( $lsusb_path 2>/dev/null )
+	fi
+	log_function_data 'raw' "usb_data:\n$lsusb_data"
+	if [[ -n $lsusb_data ]];then
+		# for every sound card symlink in /proc/asound - display information about it
+		for usb_proc_file in /proc/asound/*
+		do
+			# If the file is a symlink, and contains an important usb exclusive file: continue
+			if [[ -L $usb_proc_file && -e $usb_proc_file/usbid  ]]; then
+				# find the contents of usbid in lsusb and print everything after the 7th word on the
+				# corresponding line. Finally, strip out commas as they will change the driver :)
+				usb_id=$( cat $usb_proc_file/usbid )
+				usb_data=$( grep "$usb_id" <<< "$lsusb_data" )
+				if [[ -n $usb_data && -n $usb_id ]];then
+					usb_data=$( gawk '
+					BEGIN {
+						IGNORECASE=1
+						string=""
+						separator=""
+					}
+					{
+						gsub( /,/, " ", $0 )
+						gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
+						gsub(/ [ \t]+/, " ", $0)
+						for ( i=7; i<= NF; i++ ) {
+							string = string separator $i
+							separator = " "
+						}
+						if ( $2 != "" ){
+							sub(/:/,"", $4)
+							print string ",USB Audio,,," $2 "-" $4 "," $6
+						}
+					}' <<< "$usb_data" )
+				fi
+				# this method is interesting, it shouldn't work but it does
+				#A_AUDIO_DATA=( "${A_AUDIO_DATA[@]}" "$usb_data,USB Audio,," )
+				# but until we learn why the above worked, I'm using this one, which is safer
+				if [[ -n $usb_data ]];then
+					array_count=${#A_AUDIO_DATA[@]}
+					A_AUDIO_DATA[$array_count]="$usb_data"
+				fi
+			fi
+		done
+	fi
+	IFS="$ORIGINAL_IFS"
+	temp_array=${A_AUDIO_DATA[@]}
+	log_function_data "A_AUDIO_DATA: $temp_array"
+	
+	eval $LOGFE
+}
+
+get_audio_alsa_data()
+{
+	eval $LOGFS
+	local alsa_data='' temp_array=''
+
+	# now we'll get the alsa data if the file exists
+	if [[ $B_ASOUND_VERSION_FILE == 'true' ]];then
+		IFS=","
+		A_ALSA_DATA=( $( 
+		gawk '
+			BEGIN {
+				IGNORECASE=1
+				alsa=""
+				version=""
+			}
 			# some alsa strings have the build date in (...)
 			# remove trailing . and remove possible second line if compiled by user
 			$0 !~ /compile/ {
-				gsub( "Driver | [(].*[)]|\.$","",$0 )
+				gsub( /Driver | [(].*[)]|\.$/,"",$0 )
 				gsub(/,/, " ", $0)
 				gsub(/^ +| +$/, "", $0)
 				gsub(/ [ \t]+/, " ", $0)
-				if ( $0 != "" ){
-					print $0
+				sub(/Advanced Linux Sound Architecture/, "ALSA", $0)
+				if ( $1 == "ALSA" ){
+					alsa=$1
 				}
-		}' $FILE_ASOUND_VERSION )
+				version=$NF
+				print alsa "," version
+			}' $FILE_ASOUND_VERSION ) )
+		IFS="$ORIGINAL_IFS"
 		log_function_data 'cat' "$FILE_ASOUND_VERSION"
 	fi
-	echo "$alsa_data"
-	log_function_data "alsa_data: $alsa_data"
+	temp_array=${A_ALSA_DATA[@]}
+	log_function_data "A_ALSA_DATA: $temp_array"
 	eval $LOGFE
 }
 
@@ -1878,34 +3479,70 @@ get_audio_alsa_data()
 get_cpu_core_count()
 {
 	eval $LOGFS
+	local cpu_physical_count='' cpu_core_count='' cpu_type='' cpu_alpha_count=''
 	if [[ $B_CPUINFO_FILE == 'true' ]]; then
 		# load the A_CPU_TYPE_PCNT_CCNT core data array
 		get_cpu_ht_multicore_smp_data
 		## Because of the upcoming release of cpus with core counts over 6, a count of cores is given after Deca (10)
 		# count the number of processors given
-		local cpu_physical_count=${A_CPU_TYPE_PCNT_CCNT[1]}
-		local cpu_core_count=${A_CPU_TYPE_PCNT_CCNT[2]}
-		local cpu_type=${A_CPU_TYPE_PCNT_CCNT[0]}
+		cpu_physical_count=${A_CPU_TYPE_PCNT_CCNT[1]}
+		cpu_core_count=${A_CPU_TYPE_PCNT_CCNT[2]}
+		cpu_type=${A_CPU_TYPE_PCNT_CCNT[0]}
 
 		# match the numberic value to an alpha value
-		case $cpu_core_count in
-			1) cpu_alpha_count='Single';;
-			2) cpu_alpha_count='Dual';;
-			3) cpu_alpha_count='Triple';;
-			4) cpu_alpha_count='Quad';;
-			5) cpu_alpha_count='Penta';;
-			6) cpu_alpha_count='Hexa';;
-			7) cpu_alpha_count='Hepta';;
-			8) cpu_alpha_count='Octa';;
-			9) cpu_alpha_count='Ennea';;
-			10) cpu_alpha_count='Deca';;
-			*) cpu_alpha_count='Multi';;
-		esac
+		cpu_alpha_count=$( get_cpu_core_count_alpha "$cpu_core_count" )
+		
 		# create array, core count integer; core count string
 		# A_CPU_CORE_DATA=( "$cpu_core_count" "$cpu_alpha_count Core$cpu_type" )
 		A_CPU_CORE_DATA=( "$cpu_physical_count" "$cpu_alpha_count" "$cpu_type" "$cpu_core_count" )
+	elif [[ -n $BSD_TYPE ]];then
+		local gawk_fs=': '
+	
+		if [[ $BSD_VERSION == 'openbsd' ]];then
+			gawk_fs='='
+		fi
+		cpu_core_count=$( gawk -F "$gawk_fs" '
+		# note: on openbsd can also be hw.ncpufound so exit after first
+		/^hw.ncpu/ {
+			print $NF
+			exit
+		}' <<< "$Sysctl_a_Data" )
+		if [[ -n $( grep -E '^[0-9]+$' <<< "$cpu_core_count" ) ]];then
+			cpu_alpha_count=$( get_cpu_core_count_alpha "$cpu_core_count" )
+			if [[ $cpu_core_count -gt 1 ]];then
+				cpu_type='SMP'
+			fi
+		fi
+		cpu_physical_count=1
+		A_CPU_CORE_DATA=( "$cpu_physical_count" "$cpu_alpha_count" "$cpu_type" "$cpu_core_count" )
 	fi
-	log_function_data "A_CPU_CORE_DATA: ${A_CPU_CORE_DATA[@]}"
+	temp_array=${A_CPU_CORE_DATA[@]}
+	log_function_data "A_CPU_CORE_DATA: $temp_array"
+	eval $LOGFE
+}
+
+# args: $1 - integer core count
+get_cpu_core_count_alpha()
+{
+	eval $LOGFS
+	local cpu_alpha_count=''
+	
+	case $1 in
+		1) cpu_alpha_count='Single';;
+		2) cpu_alpha_count='Dual';;
+		3) cpu_alpha_count='Triple';;
+		4) cpu_alpha_count='Quad';;
+		5) cpu_alpha_count='Penta';;
+		6) cpu_alpha_count='Hexa';;
+		7) cpu_alpha_count='Hepta';;
+		8) cpu_alpha_count='Octa';;
+		9) cpu_alpha_count='Ennea';;
+		10) cpu_alpha_count='Deca';;
+		*) cpu_alpha_count='Multi';;
+	esac
+	
+	echo $cpu_alpha_count
+	
 	eval $LOGFE
 }
 
@@ -1913,21 +3550,39 @@ get_cpu_core_count()
 get_cpu_data()
 {
 	eval $LOGFS
-	local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits=''
+	local i='' j='' cpu_array_nu='' a_cpu_working='' multi_cpu='' bits='' temp_array=''
+	local bsd_cpu_flags=''
 
 	if [[ $B_CPUINFO_FILE == 'true' ]];then
 		# stop script for a bit to let cpu slow down before parsing cpu /proc file
 		sleep $CPU_SLEEP
 		IFS=$'\n'
-		A_CPU_DATA=( $( gawk -F': ' '
+		A_CPU_DATA=( $( 
+		gawk -F': ' '
 		BEGIN {
 			IGNORECASE=1
+			# need to prime nr for arm cpus, which do not have processor number output in some cases
+			nr = 0
+			count = 0
+			bArm = "false"
 		}
 		# TAKE STRONGER NOTE: \t+ does NOT always work, MUST be [ \t]+
 		# TAKE NOTE: \t+ will work for $FILE_CPUINFO, but SOME ARBITRARY FILE used for TESTING might contain SPACES!
 		# Therefore PATCH to use [ \t]+ when TESTING!
 		/^processor[ \t]+:/ {
-			nr = $NF
+			gsub(/,/, " ", $NF)
+			gsub(/^ +| +$/, "", $NF)
+			if ( $NF ~ "^[0-9]+$" ) {
+				nr = $NF
+			}
+			else {
+				if ( $NF ~ "^ARM" ) {
+					bArm = "true"
+				}
+				count += 1
+				nr = count - 1
+				cpu[nr, "model"] = $NF
+			}
 		}
 
 		/^model name|^cpu\t+:/ {
@@ -1937,6 +3592,9 @@ get_cpu_data()
 			gsub(/^ +| +$/, "", $NF)
 			gsub(/ [ \t]+/, " ", $NF)
 			cpu[nr, "model"] = $NF
+			if ( $NF ~ "^ARM" ) {
+				bArm = "true"
+			}
 		}
 
 		/^cpu MHz|^clock\t+:/ {
@@ -1961,8 +3619,12 @@ get_cpu_data()
 			cpu[nr, "cache"] = $NF
 		}
 
-		/^flags/ {
+		/^flags|^features/ {
 			cpu[nr, "flags"] = $NF
+			# not all ARM cpus show ARM in model name
+			if ( $1 ~ /^features/ ) {
+				bArm = "true"
+			}
 		}
 
 		/^bogomips/ {
@@ -1977,26 +3639,120 @@ get_cpu_data()
 		END {
 			#if (!nr) { print ",,,"; exit } # <- should this be necessary or should bash handle that
 			for ( i = 0; i <= nr; i++ ) {
-				print cpu[i, "model"] "," cpu[i, "speed"] "," cpu[i, "cache"] "," cpu[i, "flags"] "," cpu[i, "bogomips"] ","  cpu[nr, "vendor"]
+				# note: assuming bogomips for arm at 1 x clock
+				# http://en.wikipedia.org/wiki/BogoMips ARM could change so watch this
+				# maybe add:  && bArm == "true" but I think most of the bogomips roughly equal cpu speed if not amd/intel
+				if ( cpu[i, "bogomips"] != "" && cpu[i, "speed"] == "" ) {
+					cpu[i, "speed"] = cpu[i, "bogomips"]
+				}
+				print cpu[i, "model"] "," cpu[i, "speed"] "," cpu[i, "cache"] "," cpu[i, "flags"] "," cpu[i, "bogomips"] ","  cpu[nr, "vendor"] "," bArm
 			}
+			# this is / was used in inxi short output only, but when it is N/A, need to use the previous array
+			# value, from above, the actual speed that is, for short output, key 0.
 			if (!min) {
-				print "not found"
+				print "N/A"
 				exit
 			}
-			if (min != max) {
-				printf("Min:%s%s Max:%s%s\n", min, "Mhz", max, "Mhz")
-			}
 			else {
-				printf("%s %s\n", max, "Mhz")
+				if (min != max) {
+					printf("Min:%s%s Max:%s%s\n", min, "Mhz", max, "Mhz")
+				}
+				else {
+					printf("%s %s\n", max, "Mhz")
+				}
 			}
-		}' $FILE_CPUINFO ) )
+		}
+ 		' $FILE_CPUINFO ) )
+ 		IFS="$ORIGINAL_IFS"
 		log_function_data 'cat' "$FILE_CPUINFO"
+	elif [[ -n $BSD_TYPE ]];then
+		get_cpu_data_bsd
 	fi
+	
+	temp_array=${A_CPU_DATA[@]}
+	log_function_data "A_CPU_DATA: $temp_array"
+# 	echo ta: ${temp_array[@]}
+	eval $LOGFE
+# 	echo getMainCpu: ${[@]}
+}
+
+get_cpu_data_bsd()
+{
+	eval $LOGFS
 
+	local bsd_cpu_flags=$( get_cpu_flags_bsd )
+	local gawk_fs=': '
+	
+	if [[ $BSD_VERSION == 'openbsd' ]];then
+		gawk_fs='='
+	fi
+		
+	IFS=$'\n'
+	A_CPU_DATA=( $( 
+	gawk -F "$gawk_fs" -v cpuFlags="$bsd_cpu_flags" '
+	BEGIN {
+		IGNORECASE=1
+		cpuModel=""
+		cpuClock=""
+		cpuCache=""
+		cpuBogomips=""
+		cpuVendor=""
+	}
+	/^hw.model/ {
+		gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF )
+		gsub(/'"$BAN_LIST_CPU"'/, "", $NF )
+		sub(//,"",$NF)
+		sub(/[a-z]+-core/, "", $NF )
+		gsub(/^ +| +$|\"/, "", $NF)
+		gsub(/ [ \t]+/, " ", $NF)
+		cpuModel=$NF
+		if ( cpuClock != "" ) {
+			exit
+		}
+	}
+	/^hw.(clock|cpuspeed)/ {
+		cpuClock=$NF
+		if ( cpuModel != "" ) {
+			exit
+		}
+	}
+	END {
+		print cpuModel "," cpuClock "," cpuCache "," cpuFlags "," cpuBogomips ","  cpuVendor
+		print "N/A"
+	}' <<< "$Sysctl_a_Data" ) )
 	IFS="$ORIGINAL_IFS"
-	log_function_data "A_CPU_DATA: ${A_CPU_DATA[@]}"
+	
+	eval $LOGFE
+}
+
+get_cpu_flags_bsd()
+{
+	eval $LOGFS
+	
+	local cpu_flags=$( gawk -F '=' '
+	BEGIN {
+		IGNORECASE=1
+		cpuFlags=""
+	}
+	/^CPU:/ {
+		while ( getline && !/memory/  ) {
+			if ( $1 ~ /Features/ ) {
+				# clean up odd stuff like <b23>
+				gsub(/<[a-z0-9]+>/,"", $2)
+				# all the flags are contained within < ... > on freebsd at least
+				gsub(/.*<|>.*/,"", $2)
+				gsub(/,/," ", $2)
+				cpuFlags = cpuFlags " " $2
+			}
+		}
+		cpuFlags=tolower(cpuFlags)
+		print cpuFlags
+		exit
+	}' <<< "$Dmesg_Boot_Data" )
+	
+	echo $cpu_flags
+	log_function_data "$cpu_flags"
 	eval $LOGFE
-# 	echo getMainCpu: ${[@]}
 }
 
 ## this is for counting processors and finding HT types
@@ -2004,100 +3760,571 @@ get_cpu_ht_multicore_smp_data()
 {
 	eval $LOGFS
 	# in /proc/cpuinfo
-	# 				algorithm
-	# if > 1 processor && processor id (physical id) == core id then Hyperthreaded (HT)
-	# if > 1 processor && different processor ids then Multiple Processors (SMP)
-	# if > 1 processor && processor id != core id then Multi-Core Processors (MCP)
-	# if = 1 processor then single core/processor Uni-Processor (UP)
-
+	local temp_array=''
+	
+	# note: known bug with xeon intel, they show a_core_id/physical_id as 0 for ht 4 core
 	if [[ $B_CPUINFO_FILE == 'true' ]]; then
 		A_CPU_TYPE_PCNT_CCNT=( $(
 		gawk '
 		BEGIN {
 			FS=": "
 			IGNORECASE = 1
-			core_count = 0
-			holder = 0
-			i = 0
-			index_temp = ""
 			num_of_cores = 0
-			physical_cpu_count = 0
-			processor_logical_count = 0
-			processors = 1
-			type = "UP"
+			num_of_processors = 0
+			num_of_physical_cpus = 0
+			cpu_core_count = 0
+			siblings = 0
+			# these 3 arrays cannot be declared because that sets the first element
+			# but leaving this here so that we avoid doing that in the future
+			# a_core_id = ""
+			# a_processor_id = ""
+			# a_physical_id = ""
+			cpu_type = "-"
+			# note: we need separate iterators because some cpuinfo data has only
+			# processor, no core id or phys id
+			proc_iter = 0
+			core_iter = "" # set from actual NF data
+			phys_iter = "" # set from actual NF data
+			# needed to handle arm cpu, no processor number cases
+			arm_count = 0
+			nr = 0
+			bArm = "false"
+			bXeon = "false"
 		}
-		# counts logical processors, both HT and physical
-		/^processor/ {
-			processor_logical_count = $NF + 1
+		# hack to handle xeons which can have buggy /proc/cpuinfo files
+		/^model name/ && ( $0 ~ /Xeon/ ) {
+			bXeon = "true"
 		}
-		# counts physical cores (not used currently)
-		/^cpu cores/ {
-			num_of_cores = $NF
+		# only do this once since sibling count does not change. 
+		/^siblings/ && ( bXeon == "true" ) && ( siblings == 0 ) {
+			gsub(/[^0-9]/,"",$NF)
+			if ( $NF != "" ) {
+				siblings = $NF
+			}
+		}
+		# array of logical processors, both HT and physical
+		
+		/^processor/ {
+			gsub(/,/, " ", $NF)
+			gsub(/^ +| +$/, "", $NF)
+			if ( $NF ~ "^[0-9]+$" ) {
+				a_processor_id[proc_iter] = $NF
+				proc_iter++
+			}
+			else {
+				# note, for dual core, this can be off by one because the first
+				# line says: Processor : Arm.. but subsequent say: processor : 0 and so on as usual
+				if ( $NF ~ "^ARM" ) {
+					bArm = "true"
+				}
+				arm_count += 1
+				nr = arm_count - 1
+				# note: do not iterate because new ARM syntax puts cpu in processsor : 0 syntax
+				a_processor_id[proc_iter] = nr
+			}
 		}
-		# array of physical cpus ids
+		
+		# array of physical cpu ids, note, this will be unset for vm cpus in many cases
+		# because they have no physical cpu, so we cannot assume this will be here.
 		/^physical/ {
-			a_physical_id[i] = $NF
+			phys_iter = $NF
+			a_physical_id[phys_iter] = $NF
 		}
-		# array of core ids
+		# array of core ids, again, here we may have HT, so we need to create an array of the
+		# actual core ids. As With physical, we cannot assume this will be here in a vm
 		/^core id/ {
-			a_core_id[i] = $NF
-			i++
+			core_iter = $NF
+			a_core_id[core_iter] = $NF
+		}
+		# this will be used to fix an intel glitch if needed, cause, intel
+		# sometimes reports core id as the same number for each core, 
+		# so if cpu cores shows greater value than number of cores, use this. 
+		/^cpu cores/ {
+			cpu_core_count = $NF
 		}
 		END {
-			# look for the largest id number, and assign it (dumped this method due intel)
-			# note that there are some cases, intel i5 core 2 HT where core_id shows 
-			# as 0/2, not 0/1. this triggers a 3 core output, erroneously.
-			# Sorting the data solves this, since the counter now is mechanical, not
-			# trusting the data from the proc/cpuinfo at all re what the core id is
-			asort(a_core_id)
-			# awk increments j++ counter BEFORE the loop?
-			for ( j = 0; j <= processor_logical_count; j++ ) {
-				# if ( j in a_core_id && a_core_id[j] > core_count ) {
-				 if ( j in a_core_id  ) {
-					#core_count = a_core_id[j]
-					if ( a_core_id[j] != holder ){
-						core_count++
-						holder = a_core_id[j]
-					}
-				}
+			## 	Look thru the array and filter same numbers.
+			##	only unique numbers required
+			## 	this is to get an accurate count
+			##	we are only concerned with array length
+			i = 0
+			## count unique processors ##
+			# note, this fails for intel cpus at times
+			for ( i in a_processor_id ) {
+				num_of_processors++
+			}
+			i = 0
+			## count unique physical cpus ##
+			for ( i in a_physical_id ) {
+				num_of_physical_cpus++
 			}
-			core_count = core_count + 1 
 			
-			# trick, set the index equal to value, if the same, it will overwrite
-			# this lets us create the actual array of true cpu physical ids
-			for ( j in a_physical_id ) {
-				index_temp = a_physical_id[j]
-				a_cpu_physical_working[index_temp] = a_physical_id[j]
+			i = 0
+			## count unique cores ##
+			for ( i in a_core_id ) {
+				num_of_cores++
 			}
-			# note that length() is a gawk >= 3.1.5 only method, better to do it manually
-			for ( j in a_cpu_physical_working ) {
-				++physical_cpu_count
+			# 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 ( bXeon == "true" && num_of_cores == 1 && siblings > 1 ) {
+				num_of_cores = siblings/2
 			}
-
-			# looking at logical processor counts over 1, which means either HT, SMP or MCP
-			# http://en.wikipedia.org/wiki/Symmetric_multiprocessing
-			if ( processor_logical_count > 1 && core_count > 1 ) {
-				if ( processor_logical_count > core_count && physical_cpu_count > 1 ) {
-					type = "SMP-HT" # could be Xeon/P4 HT dual cpu
+			# 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 ( ( num_of_cores == 0 ) && ( cpu_core_count * num_of_physical_cpus > 1 ) ) {
+				num_of_cores = cpu_core_count * num_of_physical_cpus
+			}
+			# last check, seeing some intel cpus and vms with intel cpus that do not show any
+			# core id data at all, or siblings.
+			if ( num_of_cores == 0 && num_of_processors > 0 ) {
+				num_of_cores = num_of_processors
+			}
+			# ARM/vm cpu fix, if no physical or core found, use count of 1 instead
+			if ( num_of_physical_cpus == 0 ) {
+				num_of_physical_cpus = 1
+			}
+# 			print "NoCpu: " num_of_physical_cpus
+# 			print "NoCores: " num_of_cores
+# 			print "NoProc:" num_of_processors
+# 			print "CpuCoreCount:" cpu_core_count
+			####################################################################
+			# 				algorithm
+			# if > 1 processor && processor id (physical id) == core id then Hyperthreaded (HT)
+			# if > 1 processor && processor id (physical id) != core id then Multi-Core Processors (MCP)
+			# if > 1 processor && processor ids (physical id) > 1 then Multiple Processors (SMP)
+			# if = 1 processor then single core/processor Uni-Processor (UP)
+			if ( num_of_processors > 1 || ( bXeon == "true" && siblings > 0 ) ) {
+				# non-multicore HT
+				if ( num_of_processors == (num_of_cores * 2) ) {
+					cpu_type = cpu_type "HT-"
 				}
-				else if ( processor_logical_count > core_count ) {
-					type = "HT"  # this is more than likely a P4 w/HT or an Atom 270
+				else if ( bXeon == "true" && siblings > 1 ) {
+					cpu_type = cpu_type "HT-"
 				}
-				else {
-					type = "SMP"
+				# non-HT multi-core or HT multi-core
+				if (( num_of_processors == num_of_cores) || ( num_of_physical_cpus < num_of_cores)) {
+					cpu_type = cpu_type "MCP-"
 				}
-			}
-			# make sure to handle up cpus too
+				# >1 cpu sockets active
+				if ( num_of_physical_cpus > 1 ) {
+					cpu_type = cpu_type "SMP-"
+				}
+			} 
 			else {
-				core_count = 1
-				physical_cpu_count = 1
-			}
-			print type " " physical_cpu_count " " core_count
+				cpu_type = cpu_type "UP-"
+			}			
+			
+			print cpu_type " " num_of_physical_cpus " " num_of_cores 
 		}
-		' $FILE_CPUINFO 
-		) )
+		' $FILE_CPUINFO ) )
+	fi
+	temp_array=${A_CPU_TYPE_PCNT_CCNT[@]}
+	log_function_data "A_CPU_TYPE_PCNT_CCNT: $temp_array"
+	eval $LOGFE
+}
+
+# Detect desktop environment in use, initial rough logic from: compiz-check
+# http://forlong.blogage.de/entries/pages/Compiz-Check
+# 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)
+get_desktop_environment()
+{
+	eval $LOGFS
+	
+	# set the default, this function only runs in X, if null, don't print data out
+	local desktop_environment='' xprop_root=''
+	local version='' version_data='' toolkit=''
+
+	# works on 4, assume 5 will id the same, why not, no need to update in future
+	# KDE_SESSION_VERSION is the integer version of the desktop
+	if [[ $XDG_CURRENT_DESKTOP == 'KDE' || -n $KDE_SESSION_VERSION ]]; then
+		# note the command is actually like, kded4 --version, so we construct it
+		version_data=$( kded$KDE_SESSION_VERSION --version 2>/dev/null )
+		version=$( grep -si '^KDE Development Platform:' <<< "$version_data" | gawk '{print $4}' )
+		if [[ -z $version ]];then
+			version=$KDE_SESSION_VERSION
+		fi
+		if [[ $B_EXTRA_DATA == 'true' ]];then
+			toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
+			if [[ -n $toolkit ]];then
+				version="$version (Qt $toolkit)"
+			fi
+		fi
+		desktop_environment="KDE"
+	# KDE_FULL_SESSION property is only available since KDE 3.5.5.
+	# src: http://humanreadable.nfshost.com/files/startkde
+	elif [[ $KDE_FULL_SESSION == 'true' ]]; then
+		version_data=$( kded --version 2>/dev/null )
+		version=$( grep -si '^KDE:' <<< "$version_data" | gawk '{print $2}' )
+		# version=$( get_de_app_version 'kded' '^KDE:' '2' )
+		if [[ -z $version ]];then
+			version='3.5'
+		fi
+		if [[ $B_EXTRA_DATA == 'true' ]];then
+			toolkit=$( grep -si '^Qt:' <<< "$version_data" | gawk '{print $2}' )
+			if [[ -n $toolkit ]];then
+				version="$version (Qt $toolkit)"
+			fi
+		fi
+		desktop_environment="KDE"
+	elif [[ $XDG_CURRENT_DESKTOP == 'Unity' ]];then
+		version=$( get_de_app_version 'unity' '^unity' '2' )
+		# not certain cinn will always have version, so keep output right if not
+		if [[ -n $version ]];then
+			version="$version "
+		fi
+		if [[ $B_EXTRA_DATA == 'true' ]];then
+			toolkit=$( get_de_gtk_data )
+			if [[ -n $toolkit ]];then
+				version="${version}(Gtk ${toolkit})"
+			fi
+		fi
+		desktop_environment="Unity"
+	fi
+	# did we find it? If not, start the xprop tests
+	if [[ -z $desktop_environment ]];then
+		if [[ -n $( type -p xprop ) ]];then
+			xprop_root="$( xprop -root 2>/dev/null )"
+		fi
+		# note that cinnamon split from gnome, and and can now be id'ed via xprop,
+		# but it will still trigger the next gnome true case, so this needs to go 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.
+		if [[ -n $xprop_root && -n $( grep -is '^_MUFFIN' <<< "$xprop_root" ) ]];then
+			version=$( get_de_app_version 'cinnamon' '^cinnamon' '2' )
+			# not certain cinn will always have version, so keep output right if not
+			if [[ -n $version ]];then
+				version="$version "
+			fi
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+				toolkit=$( get_de_gtk_data )
+				if [[ -n $toolkit ]];then
+					version="${version}(Gtk ${toolkit})"
+				fi
+			fi
+			desktop_environment="Cinnamon"
+		elif [[ -n $xprop_root && -n $( grep -is '^_MARCO' <<< "$xprop_root" ) ]];then
+			version=$( get_de_app_version 'mate-about' '^MATE[[:space:]]DESKTOP' 'NF' )
+			# not certain cinn/mate will always have version, so keep output right if not
+			if [[ -n $version ]];then
+				version="$version "
+			fi
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+				toolkit=$( get_de_gtk_data )
+				if [[ -n $toolkit ]];then
+					version="${version}(Gtk ${toolkit})"
+				fi
+			fi
+			desktop_environment="MATE"
+		# note, GNOME_DESKTOP_SESSION_ID is deprecated so we'll see how that works out
+		# https://bugzilla.gnome.org/show_bug.cgi?id=542880
+		elif [[ -n $GNOME_DESKTOP_SESSION_ID ]]; then
+			if [[ -n $( type -p gnome-shell ) ]];then
+				version=$( get_de_app_version 'gnome-shell' 'gnome' '3' )
+			elif [[ -n $( type -p gnome-about ) ]];then
+				version=$( get_de_app_version 'gnome-about' 'gnome' '3' )
+			fi
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+				toolkit=$( get_de_gtk_data )
+				if [[ -n $toolkit ]];then
+					version="$version (Gtk $toolkit)"
+				fi
+			fi
+			desktop_environment="Gnome"
+		fi
+		if [[ -z $desktop_environment ]];then
+		# now that the primary ones have been handled, next is to find the ones with unique
+		# xprop detections possible
+			if [[ -n $xprop_root ]];then
+				# String: "This is xfdesktop version 4.2.12"
+				# alternate: xfce4-about --version > xfce4-about 4.10.0 (Xfce 4.10)
+				if [[ -n $( grep -Eis '\"xfce4\"' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
+					# arch linux reports null, so use alternate if null
+					if [[ -z $version ]];then
+						version=$( get_de_app_version 'xfce4-panel' '^xfce4-panel' '2' )
+						if [[ -z $version ]];then
+							version='4'
+						fi
+					fi
+					if [[ $B_EXTRA_DATA == 'true' ]];then
+						toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
+						if [[ -n $toolkit ]];then
+							version="$version (Gtk $toolkit)"
+						fi
+					fi
+					desktop_environment="Xfce"
+				# when 5 is released, the string may need updating
+				elif [[ -n $( grep -is '\"xfce5\"' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'xfdesktop' 'xfdesktop[[:space:]]version' '5' )
+					# arch linux reports null, so use alternate if null
+					if [[ -z $version ]];then
+						version=$( get_de_app_version 'xfce5-panel' '^xfce5-panel' '2' )
+						if [[ -z $version ]];then
+							version='5'
+						fi
+					fi
+					if [[ $B_EXTRA_DATA == 'true' ]];then
+						toolkit=$( get_de_app_version 'xfdesktop' 'Built[[:space:]]with[[:space:]]GTK' '4' )
+						if [[ -n $toolkit ]];then
+							version="$version (Gtk $toolkit)"
+						fi
+					fi
+					desktop_environment="Xfce"
+				elif [[ -n $( grep -is 'BLACKBOX_PID' <<< "$xprop_root" ) ]];then
+					if [[ -n $( grep -is 'fluxbox' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+						version=$( get_de_app_version 'fluxbox' '^fluxbox' '2' )
+						desktop_environment='Fluxbox'
+					else
+						desktop_environment='Blackbox'
+					fi
+				elif [[ -n $( grep -is 'OPENBOX_PID' <<< "$xprop_root" ) ]];then
+					# note: openbox-lxde --version may be present, but returns openbox data
+					version=$( get_de_app_version 'openbox' '^openbox' '2' )
+					if [[ $XDG_CURRENT_DESKTOP == 'LXDE' || \
+							-n $( grep -is 'lxde' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+						if [[ -n $version ]];then
+							version="(Openbox $version)"
+						fi
+						desktop_environment='LXDE'
+					elif [[ -n $( grep -is 'razor-desktop' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+						if [[ -n $version ]];then
+							version="(Openbox $version)"
+						fi
+						desktop_environment='Razor-QT'
+					else
+						desktop_environment='Openbox'
+					fi
+				elif [[ -n $( grep -is 'ICEWM' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'icewm' '^icewm' '2' )
+					desktop_environment='IceWM'
+				elif [[ -n $( grep -is 'ENLIGHTENMENT' <<< "$xprop_root" ) ]];then
+					# no -v or --version but version is in xprop -root
+					# ENLIGHTENMENT_VERSION(STRING) = "Enlightenment 0.16.999.49898"
+					version=$( grep -is 'ENLIGHTENMENT_VERSION' <<< "$xprop_root" | cut -d '"' -f 2 | gawk '{print $2}' )
+					desktop_environment='Enlightenment'
+				elif [[ -n $( grep -is '^I3_' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'i3' '^i3' '3' )
+					desktop_environment='i3'
+				elif [[ -n $( grep -is 'WINDOWMAKER' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'wmaker' '^Window[[:space:]]*Maker' 'NF' )
+					if [[ -n $version ]];then
+						version="$version "
+					fi
+					desktop_environment="WindowMaker"
+				elif [[ -n $( grep -is '^_WM2' <<< "$xprop_root" ) ]];then
+					# note; there isn't actually a wm2 version available but error handling should cover it and return null
+					# maybe one day they will add it?
+					version=$( get_de_app_version 'wm2' '^wm2' 'NF' )
+					# not certain will always have version, so keep output right if not
+					if [[ -n $version ]];then
+						version="$version "
+					fi
+					desktop_environment="WM2"
+				elif [[ -n $( grep -is 'herbstluftwm' <<< "$xprop_root" ) ]];then
+					version=$( get_de_app_version 'herbstluftwm' '^herbstluftwm' 'NF' )
+					if [[ -n $version ]];then
+						version="$version "
+					fi
+					desktop_environment="herbstluftwm"
+				fi
+			fi
+			# a few manual hacks for things that don't id with xprop, these are just good guesses
+			# note that gawk is going to exit after first occurance of search string, so no need for extra
+			if [[ -z $desktop_environment ]];then
+				if [[ -n $( grep -is 'fvwm-crystal'  <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'fvwm' '^fvwm' '2' )
+					desktop_environment='FVWM-Crystal'
+				elif [[ -n $( grep -is 'fvwm'  <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'fvwm' '^fvwm' '2' )
+					desktop_environment='FVWM'
+				elif [[ -n $( grep -is 'pekwm'  <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'pekwm' '^pekwm' '3' )
+					desktop_environment='pekwm'
+				elif [[ -n $( grep -is 'awesome' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'awesome' '^awesome' '2' )
+					desktop_environment='Awesome'
+				elif [[ -n $( grep -is 'scrotwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'scrotwm' '^welcome.*scrotwm' '4' )
+					desktop_environment='Scrotwm' # no --version for this one
+				elif [[ -n $( grep -is 'spectrwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'spectrwm' '^spectrwm.*welcome.*spectrwm' '5' )
+					desktop_environment='Spectrwm' # no --version for this one
+				elif [[ -n $( grep -Eis '([[:space:]]|/)twm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					desktop_environment='Twm' # no --version for this one
+				elif [[ -n $( grep -Eis '([[:space:]]|/)dwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'dwm' '^dwm' '1' )
+					desktop_environment='dwm'
+				elif [[ -n $( grep -is 'wmii2' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'wmii2' '^wmii2' '1' )
+					desktop_environment='wmii2'
+				# note: in debian at least, wmii is actuall wmii3
+				elif [[ -n $( grep -is 'wmii' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'wmii' '^wmii' '1' )
+					desktop_environment='wmii'
+				elif [[ -n $( grep -Eis '([[:space:]]|/)jwm' <<< "$Ps_aux_Data" | grep -v 'grep' ) ]];then
+					version=$( get_de_app_version 'jwm' '^jwm' '2' )
+					desktop_environment='JWM'
+				fi
+			fi
+		fi
+	fi
+	if [[ -n $version ]];then
+		version=" $version"
+	fi
+	echo "$desktop_environment${version}"
+	eval $LOGFE
+}
+
+# note: gawk doesn't support white spaces in search string, gave errors, so use [[:space:]] instead
+# args: $1 - desktop/app command for --version; $2 - search string; $3 - gawk print number
+get_de_app_version()
+{
+	local version_data='' version='' get_version='--version' 
+	
+	# mate-about -v = MATE Desktop Environment 1.4.0
+	case $1 in
+		dwm|jwm|mate-about|wmii|wmii2)
+			get_version='-v'
+			;;
+		epoch)
+			get_version='version'
+			;;
+	esac
+	
+	case $1 in
+		# note, some wm/apps send version info to stderr instead of stdout
+		dwm|ksh|scrotwm|spectrwm)
+			version_data="$( $1 $get_version 2>&1 )"
+			;;
+		csh)
+			version_data="$( tcsh $get_version 2>/dev/null )"
+			;;
+		# quick debian/buntu hack until I find a universal way to get version for these
+		dash)
+			if [[ -n $( type -p dpkg ) ]];then
+				version_data="$( dpkg -l $1 2>/dev/null )"
+			fi
+			;;
+		*)
+			version_data="$( $1 $get_version 2>/dev/null )"
+			;;
+	esac
+	
+	if [[ -n $version_data ]];then
+		version=$( gawk '
+		BEGIN {
+			IGNORECASE=1
+		}
+		/'$2'/ {
+			# sample: dwm-5.8.2, ©.. etc, why no space? who knows. Also get rid of v in number string
+			# xfce, and other, output has , in it, so dump all commas and parentheses
+			gsub(/(,|dwm-|wmii2-|wmii-|v|V|\(|\))/, "",$'$3') 
+			print $'$3'
+			exit # quit after first match prints
+		}' <<< "$version_data" )
+	fi
+	echo $version
+}
+
+get_desktop_extra_data()
+{
+	eval $LOGFS
+	local de_data=$( ps -A | gawk '
+	BEGIN {
+		IGNORECASE=1
+		desktops=""
+		separator=""
+	}
+	/(gnome-shell|gnome-panel|kicker|lxpanel|mate-panel|plasma-desktop|xfce4-panel)$/ {
+		# only one entry per type, can be multiple
+		if ( desktops !~ $NF ) {
+			desktops = desktops separator $NF
+			separator = ","
+		}
+	}
+	END {
+		print desktops
+	}
+	' )
+	echo $de_data
+	
+	eval $LOGFE
+}
+
+get_de_gtk_data()
+{
+	eval $LOGFS
+	
+	local toolkit=''
+	
+	# this is a hack, and has to be changed with every toolkit version change, and only dev systems
+	# have this installed, but it's a cross distro command so let's test it first
+	if [[ -n $( type -p pkg-config ) ]];then
+		toolkit=$( pkg-config --modversion gtk+-4.0 2>/dev/null )
+		# note: opensuse gets null output here, we need the command to get version and output sample
+		if [[ -z $toolkit ]];then
+			toolkit=$( pkg-config --modversion gtk+-3.0 2>/dev/null )
+		fi
+		if [[ -z $toolkit ]];then
+			toolkit=$( pkg-config --modversion gtk+-2.0 2>/dev/null )
+		fi
+	fi
+	# now let's go to more specific version tests, this will never cover everything and that's fine.
+	if [[ -z $toolkit ]];then
+		# we'll try some known package managers next. dpkg will handle a lot of distros 
+		# this is the most likely order as of: 2014-01-13. Not going to try to support all package managers
+		# too much work, just the very biggest ones.
+		if [[ -n $( type -p dpkg ) ]];then
+			toolkit=$( dpkg -s libgtk-3-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
+			if [[ -z $toolkit ]];then
+				toolkit=$( dpkg -s libgtk2.0-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
+			fi
+			# just guessing on gkt 4 package name
+			if [[ -z $toolkit ]];then
+				toolkit=$( dpkg -s libgtk-4-0 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
+			fi
+		elif [[ -n $( type -p pacman ) ]];then
+			toolkit=$(  pacman -Qi gtk3 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
+			if [[ -z $toolkit ]];then
+				toolkit=$( pacman -Qi gtk2 2>/dev/null | gawk -F ':' '/^Version/ {print $2}' )
+			fi
+		fi
+	fi
+	echo $toolkit
+	
+	eval $LOGFE
+}
+
+# see which dm has started if any
+get_display_manager()
+{
+	eval $LOGFS
+	# ldm - LTSP display manager
+	local dm_id_list='entranced.pid entrance/entranced.pid gdm.pid gdm3.pid kdm.pid ldm.pid lightdm.pid lxdm.pid mdm.pid nodm.pid slim.lock tint2.pid wdm.pid xdm.pid' 
+	local dm_id='' dm='' separator=''
+	# note we don't need to filter grep if we do it this way
+	local x_is_running=$( grep '/usr.*/X' <<< "$Ps_aux_Data" | grep -iv '/Xprt' )
+
+	for dm_id in $dm_id_list
+	do
+		if [[ -e /var/run/$dm_id || -e /run/$dm_id ]];then
+			# just on the off chance that two dms are running, good info to have in that case, if possible
+			dm=$dm$separator$( basename $dm_id | cut -d '.' -f 1 )
+			separator=','
+		fi
+	done
+	# might add this in, but the rate of new dm's makes it more likely it's an unknown dm, so
+	# we'll keep output to N/A
+	if [[ -n $x_is_running && -z $dm ]];then
+		if [[ -n $( grep 'startx$' <<< "$Ps_aux_Data" ) ]];then
+			dm='(startx)'
+		fi
 	fi
-	log_function_data "A_CPU_TYPE_PCNT_CCNT: ${A_CPU_TYPE_PCNT_CCNT[@]}"
+	echo $dm
+
+	log_function_data "display manager: $dm"
+
 	eval $LOGFE
 }
 
@@ -2106,14 +4333,28 @@ get_cpu_ht_multicore_smp_data()
 get_distro_data()
 {
 	eval $LOGFS
-	local i='' j='' distro='' distro_file='' a_distro_glob=''
+	local i='' j='' distro='' distro_file='' a_distro_glob='' temp_array=''
+	
+	# may need modification if archbsd / debian can be id'ed with /etc files
+	if [[ -n $BSD_TYPE ]];then
+		distro=$( uname -sr )
+		echo "$distro"
+		log_function_data "distro: $distro"
+		eval $LOGFE
+		return 0
+	fi
 
 	# get the wild carded array of release/version /etc files if present
 	shopt -s nullglob
 	cd /etc
+	# 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
 	a_distro_glob=(*[-_]{release,version})
 	cd "$OLDPWD"
 	shopt -u nullglob
+	
+	temp_array=${a_distro_glob[@]}
+	log_function_data "A_GLX_DATA: $temp_array"
 
 	if [[ ${#a_distro_glob[@]} -eq 1 ]];then
 		distro_file="${a_distro_glob}"
@@ -2128,11 +4369,13 @@ get_distro_data()
 				# 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
-				# because Mint does not use such, it must be done as below
+				# because Mint does not use such, it must be done as below 
 				## this if statement requires the spaces and * as it is, else it won't work
 				##
 				if [[ " $DISTROS_LSB_GOOD " == *" ${i} "* ]] && [[ $B_LSB_FILE == 'true' ]];then
 					distro_file='lsb-release'
+				elif [[ " $DISTROS_OS_RELEASE_GOOD " == *" ${i} "* ]] && [[ $B_OS_RELEASE_FILE == 'true' ]];then
+					distro_file='os-release'
 				else
 					distro_file="${i}"
 				fi
@@ -2143,23 +4386,33 @@ get_distro_data()
 	log_function_data "distro_file: $distro_file"
 	# first test for the legacy antiX distro id file
 	if [[ -e /etc/antiX ]];then
-		distro="$( egrep -oi 'antix.*\.iso' <<< $( remove_erroneous_chars '/etc/antiX' ) | sed 's/\.iso//' )"
+		distro="$( grep -Eoi 'antix.*\.iso' <<< $( remove_erroneous_chars '/etc/antiX' ) | sed 's/\.iso//' )"
 	# this handles case where only one release/version file was found, and it's lsb-release. 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.
-	elif [[ -n $distro_file && -f $FILE_LSB_RELEASE && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
-		distro=$( get_distro_lsb_data )
+	elif [[ -n $distro_file && $B_LSB_FILE == 'true' && " $DISTROS_LSB_GOOD" == *" $distro_file "* ]];then
+		distro=$( get_distro_lsb_os_release_data 'lsb-file' )
 	elif [[ $distro_file == 'lsb-release' ]];then
-		distro=$( get_distro_lsb_data )
+		distro=$( get_distro_lsb_os_release_data 'lsb-file' )
+	elif [[ $distro_file == 'os-release' ]];then
+		distro=$( get_distro_lsb_os_release_data 'os-release-file' )
 	# then if the distro id file was found and it's not in the exluded primary distro file list, read it
 	elif [[ -n $distro_file && -s /etc/$distro_file && " $DISTROS_EXCLUDE_LIST " != *" $distro_file "* ]];then
-		distro=$( remove_erroneous_chars "/etc/$distro_file" )
+		# new opensuse uses os-release, but older ones may have a similar syntax, so just use the first line
+		if [[ $distro_file == 'SuSE-release' ]];then
+			# leaving off extra data since all new suse have it, in os-release, this file has line breaks, like os-release
+			# but in case we  want it, it's: CODENAME = Mantis  | VERSION = 12.2 
+			# for now, just take first occurance, which should be the first line, which does not use a variable type format
+			distro=$( grep -i -m 1 'suse' /etc/$distro_file )
+		else
+			distro=$( remove_erroneous_chars "/etc/$distro_file" )
+		fi
 	# otherwise try  the default debian/ubuntu /etc/issue file
 	elif [[ -f /etc/issue ]];then
 		# lsb gives more manageable and accurate output than issue, but mint should use issue for now
 		# some bashism, boolean must be in parenthesis to work correctly, ie [[ $(boolean) ]] not [[ $boolean ]]
 		if [[ $B_LSB_FILE == 'true' ]] && [[ -z $( grep -i 'mint' /etc/issue ) ]];then
-			distro=$( get_distro_lsb_data )
+			distro=$( get_distro_lsb_os_release_data 'lsb-file' )
 		else
 			distro=$( gawk '
 			BEGIN {
@@ -2172,10 +4425,17 @@ get_distro_data()
 				gsub(/ [ \t]+/, " ")
 				print
 			}' /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 [[ -n $( grep -i 'arch linux' <<< $distro ) ]];then
+				distro='Arch Linux'
+			fi
 		fi
 	fi
-
-	if [[ ${#distro} -gt 80 ]] &&  [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
+	
+	if [[ ${#distro} -gt 80 ]] && [[ $B_HANDLE_CORRUPT_DATA != 'true' ]];then
 		distro="${RED}/etc/${distro_file} corrupted, use -% to override${NORMAL}"
 	fi
 	## note: would like to actually understand the method even if it's not used
@@ -2183,88 +4443,338 @@ get_distro_data()
 	## 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 [[ -z $distro ]] && [[ $B_LSB_FILE == 'true' ]];then
-		distro=$( get_distro_lsb_data )
+		distro=$( get_distro_lsb_os_release_data 'lsb-file' )
 	fi
-	## finally, if all else has failed, give up
-	if [[ -z $distro ]];then
-		distro='Unknown distro o_O'
+	if [[ -z $distro ]] && [[ $B_OS_RELEASE_FILE == 'true' ]];then
+		distro=$( get_distro_lsb_os_release_data 'os-release-file' )
 	fi
-
-	# this handles an arch bug where /etc/arch-release is empty and /etc/issue is corrupted
-	if [[ -n $( grep -i 'arch linux' <<< $distro ) ]];then
-		distro='Arch Linux'
+	# now some final null tries
+	if [[ -z $distro ]];then
+		# 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?
+		if [[ -n $distro_file ]] && [[ " $DISTROS_DERIVED $DISTROS_PRIMARY " == *" $distro_file "* ]];then
+			distro=$( sed $SED_RX -e 's/[-_]//' -e 's/(release|version)//' <<< $distro_file | sed $SED_RX 's/^([a-z])/\u\1/' )
+		fi
+		## finally, if all else has failed, give up
+		if [[ -z $distro ]];then
+			distro='unknown'
+		fi
 	fi
-
+	# final step cleanup of unwanted information
+	# opensuse has the x86 etc type string in names, not needed as redundant since -S already shows that
+	distro=$( gawk '
+	BEGIN {
+		IGNORECASE=1
+	}
+	{
+		sub(/ *\(*(x86_64|i486|i586|i686|686|586|486)\)*/, "", $0)
+		print $0
+	}' <<< $distro )
 	echo "$distro"
 	log_function_data "distro: $distro"
 	eval $LOGFE
 }
 
-# args: $1 - optional, app, uses the app test, not being used now
-get_distro_lsb_data()
+# args: $1 - lsb-file/lsb-app/os-release-file
+get_distro_lsb_os_release_data()
 {
 	eval $LOGFS
 	local distro=''
+	
+	case $1 in
+		lsb-file)
+			if [[ $B_LSB_FILE == 'true' ]];then
+				distro=$( gawk -F '=' '
+				BEGIN {
+					IGNORECASE=1
+				}
+				# clean out unwanted characters
+				{ 
+					gsub(/\\|\"|[:\47]/,"", $0 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
+				}
+				# note: adding the spacing directly to variable to make sure distro output is null if not found
+				/^DISTRIB_ID/ {
+					# this is needed because grep for "arch" is too loose to be safe
+					if ( $2 == "arch" ) {
+						distroId = "Arch Linux"
+					}
+					else if ( $2 != "n/a" ) {
+						distroId = $2 " "
+					}
+				}
+				/^DISTRIB_RELEASE/ {
+					if ( $2 != "n/a" ) {
+						distroRelease = $2 " "
+					}
+				}
+				/^DISTRIB_CODENAME/ {
+					if ( $2 != "n/a" ) {
+						distroCodename = $2 " "
+					}
+				}
+				# sometimes some distros cannot do their lsb-release files correctly, so here is
+				# one last chance to get it right.
+				/^DISTRIB_DESCRIPTION/ {
+					if ( $2 != "n/a" ) {
+						distroDescription = $2
+					}
+				}
+				END {
+					fullString=""
+					if ( distroId == "" && distroRelease == "" && distroCodename == "" && distroDescription != "" ){
+						fullString = distroDescription
+					}
+					else {
+						fullString = distroId distroRelease distroCodename
+					}
+					print fullString
+				}
+				' $FILE_LSB_RELEASE )
+				log_function_data 'cat' "$FILE_LSB_RELEASE"
+			fi
+			;;
+		lsb-app)
+			# this is HORRIBLY slow, not using
+			if [[  -n $( type -p lsb_release ) ]];then
+				distro=$( echo "$( lsb_release -irc )" | gawk -F ':' '
+				BEGIN { 
+					IGNORECASE=1 
+				}
+				# clean out unwanted characters
+				{ 
+					gsub(/\\|\"|[:\47]/,"", $0 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
+				}
+				/^Distributor ID/ {
+					distroId = $2
+				}
+				/^Release/ {
+					distroRelease = $2
+				}
+				/^Codename/ {
+					distroCodename = $2
+				}
+				END {
+					print distroId " " distroRelease " (" distroCodename ")"
+				}' )
+			fi
+			;;
+		os-release-file)
+			if [[ $B_OS_RELEASE_FILE == 'true' ]];then
+				distro=$( gawk -F '=' '
+				BEGIN {
+					IGNORECASE=1
+					prettyName=""
+					regularName=""
+					versionName=""
+					versionId=""
+					distroName=""
+				}
+				# clean out unwanted characters
+				{ 
+					gsub(/\\|\"|[:\47]/,"", $0 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $2 )
+					gsub(/^[[:space:]]+|[[:space:]]+$/, "", $1 )
+				}
+				# note: adding the spacing directly to variable to make sure distro output is null if not found
+				/^PRETTY_NAME/ {
+					if ( $2 != "n/a" ) {
+						prettyName = $2
+					}
+				}
+				/^NAME/ {
+					if ( $2 != "n/a" ) {
+						regularName = $2
+					}
+				}
+				/^VERSION/ {
+					if ( $2 != "n/a" && $1 == "VERSION" ) {
+						versionName = $2
+					}
+					else if ( $2 != "n/a" && $1 == "VERSION_ID" ) {
+						versionId = $2
+					}
+				}
+				END {
+					if ( prettyName != "" ) {
+						distroName = prettyName
+					}
+					else if ( regularName != "" ) {
+						distroName = regularName
+						if ( versionName != "" ) {
+							distroName = distroName " " versionName
+						}
+						else if ( versionId != "" ) {
+							distroName = distroName " " versionId
+						}
+						
+					}
+					print distroName
+				}
+				' $FILE_OS_RELEASE )
+				log_function_data 'cat' "$FILE_OS_RELEASE"
+			fi
+			;;
+	esac
+	echo $distro
+	log_function_data "distro: $distro"
+	eval $LOGFE
+}
 
-	if [[ $B_LSB_FILE == 'true' ]] && [[ $1 != 'app' ]];then
-		distro=$( gawk -F '=' '
-		BEGIN {
-			IGNORECASE=1
-		}
-		# note: adding the spacing directly to variable to make sure distro output is null if not found
-		/^DISTRIB_ID/ {
-			gsub(/^ +| +$/, "", $NF)
-			# this is needed because grep for "arch" is too loose to be safe
-			if ( $NF == "arch" ) {
-				distroId = "Arch Linux"
-			}
-			else if ( $NF != "n/a" ) {
-				distroId = $NF " "
-			}
-		}
-		/^DISTRIB_RELEASE/ {
-			gsub(/^ +| +$/, "", $NF)
-			if ( $NF != "n/a" ) {
-				distroRelease = $NF " "
-			}
-		}
-		/^DISTRIB_CODENAME/ {
-			gsub(/^ +| +$/, "", $NF)
-			if ( $NF != "n/a" ) {
-				distroCodename = $NF " "
+get_dmidecode_data()
+{
+	eval $LOGFS
+	
+	local dmidecodePath=''
+
+	if [[ $B_DMIDECODE_SET != 'true' ]];then
+		dmidecodePath=$( type -p dmidecode 2>/dev/null )
+		if [[ -n $dmidecodePath ]];then
+			# note stripping out these lines: Handle 0x0016, DMI type 17, 27 bytes
+			# but NOT deleting them, in case the dmidecode data is missing empty lines which will be
+			# used to separate results. Then we remove the doubled empty lines to keep it clean and
+			# strip out all the stuff we don't want to see in the results.
+			DMIDECODE_DATA="$( $dmidecodePath 2>/dev/null \
+			| gawk -F ':' '
+			BEGIN {
+				IGNORECASE=1
+				cutExtraTab="false"
+				twoData=""
+				oneData=""
 			}
-		}
-		END {
-			print distroId distroRelease distroCodename
-		}' $FILE_LSB_RELEASE )
-		log_function_data 'cat' "$FILE_LSB_RELEASE"
-	fi
-	# this is HORRIBLY slow, but I don't know why, it runs fast in shell
-# 	if [[  -n $( type -p lsb_release ) && $1 == 'app' ]];then
-# 		distro=$( echo "$( lsb_release -irc )" | gawk '
-# 		{ IGNORECASE=1 }
-# 		/^Distributor ID/ {
-# 			gsub(/^ +| +$/, "", $NF)
-# 			distroId = $NF
-# 		}
-# 		/^Release/ {
-# 			gsub(/^ +| +$/, "", $NF)
-# 			distroRelease = $NF
-# 		}
-# 		/^Codename/ {
-# 			gsub(/^ +| +$/, "", $NF)
-# 			distroCodename = $NF
-# 		}
-# 		END {
-# 			print distroId " " distroRelease " (" distroCodename ")"
-# 		}' )
-# 	fi
+			{
+				# no idea why, but freebsd gawk does not do this right
+				oneData=$1
+				twoData=$2
+				if ( twoData != "" ) {
+					twoHolder="true"
+				}
+				else {
+					twoHolder="false"
+				}
+				if ( $0 ~ /^\tDMI type/ ) {
+					sub(/^\tDMI type.*/, "", $0)
+					cutExtraTab="true"
+				}
+				gsub(/'"$BAN_LIST_NORMAL"'/, "", twoData)
+				gsub(/,/, " ", $0)
+				# clean out Handle line
+				sub(/^Handle.*/,"", $0)
+				sub(/^[[:space:]]*Inactive.*/,"",$0)
+				# yes, there is a typo in a user data set, unknow
+				# Base Board Version|Base Board Serial Number
+				# Chassis Manufacturer|Chassis Version|Chassis Serial Number
+				# System manufacturer|System Product Name|System Version
+				# To Be Filled By O.E.M.
+				# strip out starting white space so that the following stuff will clear properly
+				sub(/^[[:space:]]+/, "", twoData)
+				sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", twoData) 
+				gsub(/bios|acpi/, "", twoData)
+				sub(/http:\/\/www.abit.com.tw\//, "Abit", twoData)
+				
+				# for double indented values replace with ~ so later can test for it, we are trusting that
+				# indentation will be tabbed in this case
+				# special case, dmidecode 2.2 has an extra tab and a DMI type line
+				if ( cutExtraTab == "true" ) {
+					sub(/^\t\t\t+/, "~", oneData)
+				}
+				else {
+					sub(/^\t\t+/, "~", oneData)
+				}
+				
+				gsub(/^[[:space:]]+|[[:space:]]+$/, "", twoData)
+				gsub(/^[[:space:]]+|[[:space:]]+$/, "", oneData)
+				gsub(/ [ \t]+/, " ", twoData)
+				# reconstructing the line for processing so gawk can use -F : again
+				if ( oneData != "" && twoHolder == "true" ) {
+					print oneData ":" twoData
+				}
+				else {
+					print $0
+				}
+			}' \
+			| sed '/^$/{
+N
+/^\n$/D
+}' \
+			)"
+		fi
+		B_DMIDECODE_SET='true'
+		log_function_data "DMIDECODE_DATA: $DMIDECODE_DATA"
+	fi
 
-	echo $distro
-	log_function_data "distro: $distro"
+	eval $LOGFE
+}
+# get_dmidecode_data;echo "$DMIDECODE_DATA";exit
+
+# BSD only
+get_dmesg_boot_data()
+{
+	eval $LOGFS
+	
+	local dmsg_boot_data=''
+	
+	if [[ $B_DMESG_BOOT_FILE == 'true' ]];then
+		# replace all indented items with ~ so we can id them easily while processing
+		dmsg_boot_data="$( cat $FILE_DMESG_BOOT | sed $SED_RX 's/"//g' )"
+	fi
+	echo "$dmsg_boot_data"
+	# log_function_data "$dmsg_boot_data"
 	eval $LOGFE
 }
 
+get_gcc_kernel_version()
+{
+	# note that we use gawk to get the last part because beta, alpha, git versions can be non-numeric
+	local gccVersion=''
+	
+	if [[ -e /proc/version ]];then
+		gccVersion=$( grep -Eio 'gcc[[:space:]]*version[[:space:]]*([^ \t]*)' /proc/version 2>/dev/null | gawk '{print $3}' )
+	fi
+	echo $gccVersion
+}
+
+get_gcc_system_version()
+{
+	eval $LOGFS
+	local separator='' gcc_installed='' gcc_list='' gcc_others='' temp_array=''
+	local gcc_version=$( 
+	gcc --version 2>/dev/null | sed $SED_RX 's/\([^\)]*\)//g' | gawk '
+	BEGIN {
+		IGNORECASE=1
+	}
+	/^gcc/ {
+		print $2
+		exit
+	}' 	)
+
+	# can't use xargs -L basename because not all systems support thats
+	if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+		gcc_others=$( ls /usr/bin/gcc-* 2>/dev/null )
+		if [[ -n $gcc_others ]];then
+			for item in $gcc_others
+			do
+				gcc_installed=$( basename $item | gawk -F '-' '
+				$2 ~ /^[0-9\.]+$/ {
+					print $2
+				}' )
+				if [[ -n $gcc_installed && -z $( grep "^$gcc_installed" <<< $gcc_version ) ]];then
+					gcc_list=$gcc_list$separator$gcc_installed
+					separator=','
+				fi
+			done
+		fi
+	fi
+	if [[ -n $gcc_version ]];then
+		A_GCC_VERSIONS=( "$gcc_version" $gcc_list )
+	fi
+	temp_array=${A_GCC_VERSIONS[@]}
+	log_function_data "A_GCC_VERSIONS: $temp_array"
+	eval $LOGFE
+}
 get_gpu_temp_data()
 {
 	local gpu_temp='' gpu_fan='' screens='' screen_nu='' gpu_temp_looper=''
@@ -2298,8 +4808,7 @@ get_gpu_temp_data()
 			}
 			END {
 				print gpuTemp
-			}'
-			)
+			}' 	)
 			screen_nu=$( cut -d ':' -f 2 <<< $screen_nu )
 			gpu_temp="$gpu_temp$screen_nu:$gpu_temp_looper "
 		done
@@ -2319,8 +4828,30 @@ get_gpu_temp_data()
 		}
 		END {
 			print gpuTemp
-		}'
-		)
+		}' 	)
+	# this handles some newer cases of free driver temp readouts, will require modifications as
+	# more user data appears.
+	elif [[ -n $Sensors_Data ]];then
+		gpu_temp=$( 
+		gawk '
+		BEGIN {
+			IGNORECASE=1
+			gpuTemp=""
+			separator=""
+		}
+		/^('"$SENSORS_GPU_SEARCH"')-pci/ {
+			while ( getline && !/^$/  ) {
+				if ( /^temp/ ) {
+					sub(/^[[:alnum:]]*.*:/, "", $0 ) # clear out everything to the :
+					gsub(/[\+ \t°]/, "", $1) # ° is a special case, like a space for gawk
+					gpuTemp=gpuTemp separator $1
+					separator=","
+				}	
+			}
+		}
+		END {
+			print gpuTemp
+		}' <<< "$Sensors_Data" )
 	fi
 	
 	if [[ -n $gpu_temp ]];then
@@ -2328,37 +4859,117 @@ get_gpu_temp_data()
 	fi
 }
 
+## for possible future data, not currently used
+get_graphics_agp_data()
+{
+	eval $LOGFS
+	local agp_module=''
+
+	if [[ $B_MODULES_FILE == 'true' ]];then
+		## not used currently
+		agp_module=$( gawk '
+		/agp/ && !/agpgart/ && $3 > 0 {
+			print(gensub(/(.*)_agp.*/,"\\1","g",$1))
+		}' $FILE_MODULES )
+		log_function_data 'cat' "$FILE_MODULES"
+	fi
+	log_function_data "agp_module: $agp_module"
+	eval $LOGFE
+}
+
 ## create array of gfx cards installed on system
 get_graphics_card_data()
 {
 	eval $LOGFS
-	local i=''
+	local i='' temp_array=''
 
 	IFS=$'\n'
-	A_GFX_CARD_DATA=( $( echo "$Lspci_Data" | gawk -F': ' '
+	A_GRAPHICS_CARD_DATA=( $( gawk -F': ' '
 	BEGIN {
 		IGNORECASE=1
+		busId=""
 	}
 	/vga compatible controller/ {
 		gsub(/'"$BAN_LIST_NORMAL"'/, "", $NF)
 		gsub(/,/, " ", $NF)
 		gsub(/^ +| +$/, "", $NF)
 		gsub(/ [ \t]+/, " ", $NF)
-		print $NF
-	}' ) )
+		busId=gensub(/^([0-9a-f:\.]+) (.+)$/,"\\1","",$1)
+		print $NF "," busId
+	}' <<< "$Lspci_v_Data" ) )
 	IFS="$ORIGINAL_IFS"
-# 	for (( i=0; i < ${#A_GFX_CARD_DATA[@]}; i++ ))
+# 	for (( i=0; i < ${#A_GRAPHICS_CARD_DATA[@]}; i++ ))
 # 	do
-# 		A_GFX_CARD_DATA[i]=$( sanitize_characters BAN_LIST_NORMAL "${A_GFX_CARD_DATA[i]}" )
+# 		A_GRAPHICS_CARD_DATA[i]=$( sanitize_characters BAN_LIST_NORMAL "${A_GRAPHICS_CARD_DATA[i]}" )
 # 	done
-	# handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
-	if [[ ${#A_GFX_CARD_DATA[@]} -eq 0 ]];then
-		A_GFX_CARD_DATA[0]='Failed to Detect Video Card!'
-	fi
 
 	# GFXMEM is UNUSED at the moment, because it shows AGP aperture size, which is not necessarily equal to GFX memory..
-	# GFXMEM="size=[$(echo "$Lspci_Data" | gawk '/VGA/{while (!/^$/) {getline;if (/size=[0-9][0-9]*M/) {size2=gensub(/.*\[size=([0-9]+)M\].*/,"\\1","g",$0);if (size<size2){size=size2}}}}END{print size2}')M]"
-	log_function_data "A_GFX_CARD_DATA: ${A_GFX_CARD_DATA[@]}"
+	# GFXMEM="size=[$(echo "$Lspci_v_Data" | gawk '/VGA/{while (!/^$/) {getline;if (/size=[0-9][0-9]*M/) {size2=gensub(/.*\[size=([0-9]+)M\].*/,"\\1","g",$0);if (size<size2){size=size2}}}}END{print size2}')M]"
+	temp_array=${A_GRAPHICS_CARD_DATA[@]}
+	log_function_data "A_GRAPHICS_CARD_DATA: $temp_array"
+	eval $LOGFE
+}
+
+get_graphics_driver()
+{
+	eval $LOGFS
+	
+	# list is from sgfxi plus non-free drivers
+	local driver_list='apm|ark|ati|chips|cirrus|cyrix|fbdev|fglrx|glint|i128|i740|intel|i810|imstt|mach64|mga|neomagic|nsc|nvidia|nv|openchrome|nouveau|radeon|radeonhd|rendition|s3virge|s3|savage|siliconmotion|sisusb|sis|tdfx|tga|trident|tseng|unichrome|vboxvideo|vesa|vga|via|voodoo|vmware|v4l'
+	local driver='' driver_string='' xorg_log_data='' status='' temp_array=''
+
+	if [[ $B_XORG_LOG == 'true' ]];then
+		A_GRAPHIC_DRIVERS=( $(
+		gawk '
+		BEGIN {
+			driver=""
+			bLoaded="false"
+			IGNORECASE=1
+		}
+		# note that in file names, driver is always lower case
+		/[[:space:]]Loading.*('"$driver_list"')_drv.so$/ {
+			driver=gensub(/.*[[:space:]]Loading.*('"$driver_list"')_drv.so/, "\\1", 1, $0 )
+			# 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
+ 			aDrivers[driver]="loaded" 
+		}
+		/Unloading[[:space:]].*('"$driver_list"')(|_drv.so)$/ {
+			driver=gensub(/(.*)Unloading[[:space:]].*('"$driver_list"')(|_drv.so)$/, "\\2", 1, $0 )
+			# we need to make sure that the driver has already been truly loaded, not just discussed
+			if ( driver in aDrivers ) {
+				aDrivers[driver]="unloaded"
+			}
+		}
+		/Failed.*('"$driver_list"')_drv.so|Failed.*\"('"$driver_list"')\"/ {
+ 			driver=gensub(/(.*)Failed.*('"$driver_list"')_drv.so/, "\\2", 1, $0 )
+			if ( driver == $0 ) {
+				driver=gensub(/(.*)Failed.*\"('"$driver_list"')\".*|fred/, "\\2", 1, $0 )
+			}
+			# we need to make sure that the driver has already been truly loaded, not just discussed
+			if ( driver != $0 && driver in aDrivers ) {
+				aDrivers[driver]="failed"
+			}
+		}
+		# verify that the driver actually started the desktop, even with false failed messages which can occur
+		# this is the driver that is actually driving the display
+		/.*\([0-9]+\):[[:space:]]Depth.*framebuffer/ {
+			driver=gensub(/.*('"$driver_list"')\([0-9]+\):[[:space:]]Depth.*framebuffer.*/, "\\1", 1, $0 )
+			# we need to make sure that the driver has already been truly loaded, not just discussed, also
+			# set driver to lower case because sometimes it will show as RADEON or NVIDIA in the actual x start
+			driver=tolower(driver)
+			if ( driver != $0 && driver in aDrivers ) {
+				aDrivers[driver]="loaded"
+			}
+		}
+		END {
+			for ( driver in aDrivers ) {
+				print driver "," aDrivers[driver]
+			}
+		}' < $FILE_XORG_LOG ) )
+	fi
+	temp_array=${A_GRAPHIC_DRIVERS[@]}
+	log_function_data "A_GRAPHIC_DRIVERS: $temp_array"
+	
 	eval $LOGFE
 }
 
@@ -2366,7 +4977,8 @@ get_graphics_card_data()
 get_graphics_glx_data()
 {
 	eval $LOGFS
-	if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
+	local temp_array=''
+	if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
 		IFS=$'\n'
 		A_GLX_DATA=( $( glxinfo | gawk -F ': ' '
 		# note: function declarations go before BEGIN? It appears so, confirm.
@@ -2389,22 +5001,29 @@ get_graphics_glx_data()
 			IGNORECASE=1
 		}
 		/opengl renderer/ {
+			gsub(/'"$BAN_LIST_NORMAL"'/, "", $2)
+			gsub(/ [ \t]+/, " ", $2) # get rid of the created white spaces
+			gsub(/^ +| +$/, "", $2)
 			if ( $2 ~ /mesa/ ) {
 				# Allow all mesas
 # 				if ( $2 ~ / r[3-9][0-9][0-9] / ) {
-					gsub(/'"$BAN_LIST_NORMAL"'/, "", $2)
 					a[$2]
 					# this counter failed in one case, a bug, and is not needed now
 # 					f++
 # 				}
 				next
 			}
+			
 			$2 && a[$2]
 		}
 		# 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/ {
+			# fglrx started appearing with this extra string, does not appear to communicate anything of value
+			sub(/Compatibility Profile Context/, "- CPC", $2 )
+			gsub(/ [ \t]+/, " ", $2) # get rid of the created white spaces
+			gsub(/^ +| +$/, "", $2)
 			$2 && b[$2]
 		}
 		/direct rendering/ {
@@ -2418,7 +5037,8 @@ get_graphics_glx_data()
 		# GLXR=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl renderer/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
 		#    GLXV=$(glxinfo | gawk -F ': ' 'BEGIN {IGNORECASE=1} /opengl version/ && $2 !~ /mesa/ {seen[$2]++} END {for (i in seen) {printf("%s ",i)}}')
 	fi
-	log_function_data "A_GLX_DATA: ${A_GLX_DATA[@]}"
+	temp_array=${A_GLX_DATA[@]}
+	log_function_data "A_GLX_DATA: $temp_array"
 	eval $LOGFE
 }
 
@@ -2426,105 +5046,180 @@ get_graphics_glx_data()
 get_graphics_res_data()
 {
 	eval $LOGFS
-	local screen_resolution='' 
+	local screen_resolution='' xdpy_data='' screens_count=0 tty_session=''
 
-	if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
+	if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
 		# Added the two ?'s , because the resolution is now reported without spaces around the 'x', as in
 		# 1400x1050 instead of 1400 x 1050. Change as of X.org version 1.3.0
-		screen_resolution=$( xrandr | gawk '
-		/\*/ {
-			res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0)
-		}
-		END {
-			for (n in res) {
-				if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
-					line = line ? line ", " res[n] : res[n]
-				}
+		xdpy_data="$( xdpyinfo )"
+		xdpy_count=$( grep -c 'dimensions' <<< "$xdpy_data" )
+		# we get a bit more info from xrandr than xdpyinfo, but xrandr fails to handle
+		# multiple screens from different video cards
+		if [[ $xdpy_count -eq 1 ]];then
+			screen_resolution=$( xrandr | gawk '
+			/\*/ {
+				res[++m] = gensub(/^.* ([0-9]+) ?x ?([0-9]+)[_ ].* ([0-9\.]+)\*.*$/,"\\1x\\2@\\3hz","g",$0)
 			}
-			if (line) {
-				print(line)
+			END {
+				for (n in res) {
+					if (res[n] ~ /^[[:digit:]]+x[[:digit:]]+/) {
+						line = line ? line ", " res[n] : res[n]
+					}
+				}
+				if (line) {
+					print(line)
+				}
+			}' )
+		fi
+		if [[ -z $screen_resolution || $xdpy_count -gt 1 ]];then
+			screen_resolution=$( gawk '
+			BEGIN {
+				IGNORECASE=1
+				screens = ""
+				separator = ""
 			}
-		}' )
-		if [[ -z $screen_resolution ]];then
-			screen_resolution=$( xdpyinfo | gawk '
 			/dimensions/ {
-				print $2
-			}' )
+				screens = screens separator # first time, this is null, next, has comma last
+				screens = screens $2 # then tack on the new value for nice comma list
+				separator = ", "
+			}
+			END {
+				print screens
+			}' <<< "$xdpy_data" )
 		fi
 	else
-		screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{
-			print $2"x"$1
-		}' )
+		if [[ $B_PROC_DIR == 'true' && -z $BSD_TYPE ]];then
+			screen_resolution=$( stty -F $( readlink /proc/$PPID/fd/0 ) size | gawk '{
+				print $2"x"$1
+			}' )
+		# note: this works fine for all systems but keeping the above for now since
+		# the above is probably more accurate for linux systems.
+		else
+			if [[ $B_CONSOLE_IRC != 'true' ]];then
+				screen_resolution=$( stty -a | gawk -F ';' '
+					/^speed/ {
+						gsub(/[[:space:]]*(rows|columns)[[:space:]]*/,"",$0)
+						gsub(/[[:space:]]*/,"",$2)
+						gsub(/[[:space:]]*/,"",$3)
+						print $3"x"$2
+					}' )
+			else
+				if [[ -n $BSD_TYPE ]];then
+					tty_session=$( get_tty_console_irc )
+					# getting information for tty that owns the irc client
+					screen_resolution="$( stty -f /dev/pts/$tty_session size | gawk '{print $2"x"$1}' )"
+				fi
+			fi
+		fi
 	fi
 	echo "$screen_resolution"
 	log_function_data "screen_resolution: $screen_resolution"
 	eval $LOGFE
 }
 
-## for possible future data, not currently used
-get_graphics_agp_data()
-{
-	eval $LOGFS
-	local agp_module=''
-
-	if [[ $B_MODULES_FILE == 'true' ]];then
-		## not used currently
-		agp_module=$( gawk '
-		/agp/ && !/agpgart/ && $3 > 0 {
-			print(gensub(/(.*)_agp.*/,"\\1","g",$1))
-		}' $FILE_MODULES )
-		log_function_data 'cat' "$FILE_MODULES"
-	fi
-	log_function_data "agp_module: $agp_module"
-	eval $LOGFE
-}
-
-## create array of x vendor/version data
-get_graphics_x_data()
+## create array of display server vendor/version data
+get_graphics_display_server_data()
 {
 	eval $LOGFS
-	local x_vendor='' x_version=''
+	local vendor='' version='' temp_array='' xdpy_info='' a_display_vendor_working=''
 
-	if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
+	if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
 		# X vendor and version detection.
-		x_vendor=$( xdpyinfo | gawk -F': +' '
+		# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
+		# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
+		# A failover mechanism is in place. (if $version is empty, the release number is parsed instead)
+		# xdpy_info="$( xdpyinfo )"
+		IFS=","
+		a_display_vendor_working=( $( xdpyinfo | gawk -F': +' '
 		BEGIN {
 			IGNORECASE=1
+			vendorString=""
+			version=""
+			vendorRelease=""
 		}
 		/vendor string/ {
 			gsub(/the|inc|foundation|project|corporation/, "", $2)
 			gsub(/,/, " ", $2)
 			gsub(/^ +| +$/, "", $2)
 			gsub(/ [ \t]+/, " ", $2)
-			print $2
-		}' )
-
-		# new method added since radeon and X.org and the disappearance of <X server name> version : ...etc
-		# Later on, the normal textual version string returned, e.g. like: X.Org version: 6.8.2
-		# A failover mechanism is in place. (if $x_version is empty, the release number is parsed instead)
-		x_version=$( xdpyinfo | gawk '
+			vendorString = $2
+		}
 		/version:/ {
-			print $NF
-		}' )
-		if [[ -z $x_version ]];then
-			x_version=$(xdpyinfo | gawk -F': +' '
-			BEGIN {
-				IGNORECASE=1
-			}
-			/vendor release number/ {
-				gsub(/0+$/, "", $2)
-				gsub(/0+/, ".", $2)
-				print $2
-			}' )
-		fi
-		A_X_DATA[0]="$x_vendor"
-		A_X_DATA[1]="$x_version"
+			version = $NF
+		}
+		/vendor release number/ {
+			gsub(/0+$/, "", $2)
+			gsub(/0+/, ".", $2)
+			vendorRelease = $2
+		}
+		END {
+			print vendorString "," version "," vendorRelease
+		}' ) )
+		vendor=${a_display_vendor_working[0]}
+		version=${a_display_vendor_working[1]}
 
-		#X -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
-		#This method could be used in the future to detect X when X is not running,
-		#however currently inxi ignores X checks when X is not found.
-	fi
-	log_function_data "A_X_DATA: ${A_X_DATA[@]}"
+		# this gives better output than the failure last case, which would only show:
+		# for example: X.org: 1.9 instead of: X.org: 1.9.0
+		if [[ -z $version ]];then
+			version=$( get_graphics_display_server_version )
+		fi
+		if [[ -z $version ]];then
+			version=${a_display_vendor_working[2]}
+		fi
+		
+		# some distros, like fedora, report themselves as the xorg vendor, so quick check
+		# here to make sure the vendor string includes Xorg in string
+		if [[ -z $( grep -E '(X|xorg|x\.org)' <<< $vendor ) ]];then
+			vendor="$vendor X.org"
+		fi
+		IFS="$ORIGINAL_IFS"
+		A_DISPLAY_SERVER_DATA[0]="$vendor"
+		A_DISPLAY_SERVER_DATA[1]="$version"
+	else
+		version=$( get_graphics_display_server_version )
+		if [[ -n $version ]];then
+			vendor='X.org'
+			A_DISPLAY_SERVER_DATA[0]="$vendor"
+			A_DISPLAY_SERVER_DATA[1]="$version"
+		fi
+	fi
+	temp_array=${A_DISPLAY_SERVER_DATA[@]}
+	log_function_data "A_DISPLAY_SERVER_DATA: $temp_array"
+	eval $LOGFE
+}
+
+# if other tests fail, try this one, this works for root, out of X also
+get_graphics_display_server_version()
+{
+	eval $LOGFS
+	local version='' x_data=''
+	# note that some users can have /usr/bin/Xorg but not /usr/bin/X
+	if [[ -n $( type -p X ) ]];then
+		# note: MUST be this syntax: X -version 2>&1
+		# otherwise X -version overrides everything and this comes out null.
+		# two knowns id strings: X.Org X Server 1.7.5 AND X Window System Version 1.7.5
+		#X -version 2>&1 | gawk '/^X Window System Version/ { print $5 }'
+		x_data="$( X -version 2>&1 )"
+	elif [[ -n $( type -p Xorg ) ]];then
+		x_data="$( Xorg -version 2>&1)"
+	fi
+	if [[ -n $x_data ]];then
+		version=$( 
+		gawk '
+		BEGIN {
+			IGNORECASE=1
+		}
+		/^x.org x server/ {
+			print $4
+			exit
+		}
+		/^X Window System Version/ {
+			print $5
+			exit
+		}' <<< "$x_data" )
+	fi
+	echo $version
+	log_function_data " version: $version"
 	eval $LOGFE
 }
 
@@ -2532,29 +5227,80 @@ get_graphics_x_data()
 get_hdd_data_basic()
 {
 	eval $LOGFS
-	local hdd_used=''
-	local hdd_data="$( df --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 )"
-	log_function_data 'raw' "hdd_data:\n$hdd_data"
+	local hdd_used='' temp_array='' df_string=''
+	local hdd_data='' df_test=''
 	
-	hdd_used=$( echo "$hdd_data" | gawk '
-	# also handles odd dm-1 type, from lvm
-	/^\/dev\/(mapper\/|[hs]d[a-z][0-9]+|dm[-]?[0-9]+)/ {
+	if [[ -z $BSD_TYPE ]];then
+		df_string='df -P -T --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs 
+		--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
+		--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
+	else
+		# default size is 512, so use -k for 1024
+		df_string='df -T -k'
+		# default size is 512, -H only for size in human readable format
+		# older bsds don't support -T, pain, so we'll use partial output there
+		df_test=$( df -H -T 2>/dev/null )
+		if [[ -n $df_test ]];then
+			df_string='df -k -T'
+		else
+			df_string='df -k'
+		fi
+	fi
+	hdd_data="$( eval $df_string )"
+	log_function_data 'raw' "hdd_data:\n$hdd_data"
+	hdd_used=$( 	echo "$hdd_data" | gawk -v bsdType=$BSD_TYPE '
+	BEGIN {
+		# this is used for specific cases where bind, or incorrect multiple mounts to same partitions,
+		# 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.
+		partitionsSet=""
+		# this handles a case where the same dev item is mounted twice to different points
+		devSet=""
+		devWorking=""
+		mountWorking=""
+	}
+	# using $1, not $2, because older bsd df do not have -T, filesystem type
+	( bsdType != "" ) && $1 ~ /^(aufs|devfs|devtmpfs|fdescfs|filesystem|iso9660|linprocfs|procfs|squashfs|sysfs|tmpfs|type|unionfs)$/ {
+		# note use next, not getline or it does not work right
+		next 
+	}
+	# also handles odd dm-1 type, from lvm, and mdraid, and some other bsd partition syntax
+	# note that linux 3.2.45-grsec-9th types kernels have this type of partition name: /dev/xvdc (no number, letter)
+	/^\/dev\/(mapper\/|[hsv]d[a-z][0-9]+|dm[-]?[0-9]+|ada[0-9]+p[0-9]+.*|md[0-9]+|[aw]d[0-9]+s.*|xvd[a-z])/ {
 		# this handles the case where the first item is too long
 		# and makes df wrap output to next line, so here we advance
-		# it to the next line for that single case
-		if ( NF < 5 && $0 !~ /.*\%/ ) {
+		# it to the next line for that single case. Using df -P should
+		# make this unneeded but leave it in just in case
+		if ( NF < 6 && $0 !~ /.*%/ ) {
+			devSet = devSet "~" $1 "~"
 			getline
 		}
 		# if the first item caused a wrap, use one less than standard
 		# testing for the field with % in it, ie: 34%, then go down from there
 		# this also protects against cases where the mount point has a space in the
 		# file name, thus breaking going down from $NF directly.
-		if ( $4 ~ /.*\%/ ) {
-			used += $2
+		# some bsds will also have only 6 items
+		if ( $5 ~ /.*%/ ) {
+			devWorking="~" $1 "~"
+			mountWorking="~" $6 "~"
+			if ( partitionsSet !~ mountWorking && devSet !~ devWorking ) {
+				used += $3
+			}
+			partitionsSet = partitionsSet mountWorking
+			# make sure to only include bsd real lines here, ie, short df output
+			if ( $1 ~ /^\/dev\// ) {
+				devSet = devSet devWorking
+			}
 		}
 		# otherwise use standard
-		else if ( $5 ~ /.*\%/ ) {
-			used += $3
+		else if ( $6 ~ /.*%/ ) {
+			devWorking="~" $1 "~"
+			mountWorking="~" $7 "~"
+			if ( partitionsSet !~ mountWorking && devSet !~ devWorking ) {
+				used += $4
+			}
+			partitionsSet = partitionsSet mountWorking
+			devSet = devSet devWorking
 		}
 		# and if this is not detected, give up, we need user data to debug
 		else {
@@ -2577,7 +5323,7 @@ get_hdd_data_basic()
 	if [[ $B_PARTITIONS_FILE == 'true' ]];then
 		A_HDD_DATA=( $(
 		gawk -v hddused="$hdd_used" '
-		/[hs]d[a-z]$/ {
+		/[hsv]d[a-z]$/ {
 			driveSize = $(NF - 1)*1024/1000**3
 			gsub(/,/, " ", driveSize)
 			gsub(/^ +| +$/, "", driveSize)
@@ -2588,7 +5334,8 @@ get_hdd_data_basic()
 		#	size += $3
 		# }
 		# special case from this data: 8     0  156290904 sda
-		$1 ~ /^(3|22|33|8)$/ && $NF ~ /[hs]d[a-z]$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
+		# note: vm has 252/253/254 known starter, grsec has 202
+		$1 ~ /^(3|8|22|33|202|252|253|254)$/ && $NF ~ /[hsv]d[a-z]$/ && ( $2 % 16 == 0 || $2 % 16 == 8 ) {
 			size += $3
 		}
 
@@ -2610,10 +5357,11 @@ get_hdd_data_basic()
 				print "NA,-" # print an empty array, this will be further handled in the print out function
 			}
 		}' $FILE_PARTITIONS ) )
- 		log_function_data 'cat' "$FILE_PARTITIONS"
+		log_function_data 'cat' "$FILE_PARTITIONS"
 	fi
 	IFS="$ORIGINAL_IFS"
-	log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
+	temp_array=${A_HDD_DATA[@]}
+	log_function_data "A_HDD_DATA: $temp_array"
 	eval $LOGFE
 }
 
@@ -2622,18 +5370,18 @@ get_hard_drive_data_advanced()
 {
 	eval $LOGFS
 	local a_temp_working='' a_temp_scsi='' temp_holder='' temp_name='' i='' j=''
-	local sd_ls_by_id='' ls_disk_by_id='' usb_exists=''
+	local sd_ls_by_id='' ls_disk_by_id='' usb_exists='' temp_array=''
 
 	## check for all ide type drives, non libata, only do it if hdx is in array
 	## this is now being updated for new /sys type paths, this may handle that ok too
-	if [[ -n $( egrep 'hd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
+	if [[ -n $( grep -E 'hd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
 		# remember, we're using the last array item to store the total size of disks
 		for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
 		do
 			IFS=","
 			a_temp_working=( ${A_HDD_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
-			if [[ -n $( egrep '^hd[a-z]' <<< ${a_temp_working[0]} ) ]];then
+			if [[ -n $( grep -E '^hd[a-z]' <<< ${a_temp_working[0]} ) ]];then
 				if [[ -e /proc/ide/${a_temp_working[0]}/model ]];then
 					a_temp_working[2]="$( remove_erroneous_chars /proc/ide/${a_temp_working[0]}/model )"
 				else
@@ -2688,12 +5436,13 @@ get_hard_drive_data_advanced()
 	IFS="$ORIGINAL_IFS"
 
 	## then we'll loop through that array looking for matches.
-	if [[ -n $( egrep 'sd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
+	if [[ -n $( grep -E 'sd[a-z]' <<< ${A_HDD_DATA[@]} ) ]];then
 		# first pack the main ls variable so we don't have to keep using ls /dev...
-		ls_disk_by_id="$( ls -l /dev/disk/by-id )"
+		# not all systems have /dev/disk/by-id
+		ls_disk_by_id="$( ls -l /dev/disk/by-id 2>/dev/null )"
 		for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
 		do
-			if [[ -n $( egrep '^sd[a-z]' <<< ${A_HDD_DATA[$i]} ) ]];then
+			if [[ -n $( grep -E '^sd[a-z]' <<< ${A_HDD_DATA[$i]} ) ]];then
 				IFS=","
 				a_temp_working=( ${A_HDD_DATA[$i]} )
 				IFS="$ORIGINAL_IFS"
@@ -2709,7 +5458,7 @@ get_hard_drive_data_advanced()
 						# discovered disk name AND ends with the correct identifier, sdx
 						# get rid of whitespace for some drive names and ids, and extra data after - in name
 						temp_name=$( tr ' ' '_' <<< ${a_temp_scsi[$j]} | cut -d '-' -f 1 )
-						sd_ls_by_id=$( egrep -m1 ".*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
+						sd_ls_by_id=$( grep -Em1 ".*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
 
 						if [[ -n $sd_ls_by_id ]];then
 							temp_name=${a_temp_scsi[$j]}
@@ -2726,7 +5475,7 @@ get_hard_drive_data_advanced()
 				if [[ -z $temp_name ]];then
 					temp_name="Name n/a"
 				else 
-					usb_exists=$( egrep -m1 "usb-.*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
+					usb_exists=$( grep -Em1 "usb-.*$temp_name.*${a_temp_working[0]}$" <<< "$ls_disk_by_id" )
 					if [[ -n $usb_exists ]];then
 						a_temp_working[3]='USB'
 					fi
@@ -2745,7 +5494,31 @@ get_hard_drive_data_advanced()
 		done
 		unset ls_disk_by_id # and then let's dump the data we don't need
 	fi
-	log_function_data "A_HDD_DATA: ${A_HDD_DATA[@]}"
+	temp_array=${A_HDD_DATA[@]}
+	log_function_data "A_HDD_DATA: $temp_array"
+	eval $LOGFE
+}
+
+# args: $1 - which drive to get serial number of
+get_hdd_serial_number()
+{
+	eval $LOGFS
+	
+	local hdd_serial=''
+	
+	get_partition_dev_data 'id'
+	
+	# lrwxrwxrwx 1 root root  9 Apr 26 09:32 scsi-SATA_ST3160827AS_5MT2HMH6 -> ../../sdc
+	# exit on the first instance
+	hdd_serial=$( gawk '
+	/'$1'$/ {
+		serial=gensub( /^(.+)_([^_]+)$/, "\\2", 1, $9 )
+		print serial
+		exit
+	}' <<< "$DEV_DISK_ID" )
+	
+	echo $hdd_serial
+	log_function_data "hdd serial: $hdd_serial"
 	eval $LOGFE
 }
 
@@ -2774,31 +5547,327 @@ get_hdd_temp_data()
 		fi
 		# this will fail if regular user and no sudo present, but that's fine, it will just return null
 		hdd_temp=$( eval $sudo_command $HDDTEMP_PATH -nq -u C $1 )
-		if [[ -n $hdd_temp && -n $( grep -E '^([0-9]+)$' <<< $hdd_temp ) ]];then
+		if [[ -n $hdd_temp && -n $( grep -E '^([0-9\.]+)$' <<< $hdd_temp ) ]];then
 			echo $hdd_temp
 		fi
 	fi
 	eval $LOGFE
 }
 
+get_init_data()
+{
+	eval $LOGFS
+	
+	local init_type='' init_version='' rc_type='' rc_version='' temp_array=''
+	local ls_run='' strings_init_version=''
+	local runlevel=$( get_runlevel_data )
+	local default_runlevel=$( get_runlevel_default )
+	
+	# 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, I think anyway.
+	# more data may be needed for other init systems.
+	if [[ -e /proc/1/comm && -n $( grep -s 'systemd' /proc/1/comm ) ]];then
+		init_type='systemd'
+		if [[ -n $( type -p systemd ) ]];then
+			init_version=$( get_de_app_version 'systemd' '^systemd' '2' )
+		fi
+		if [[ -z $init_version && -n $( type -p systemctl ) ]];then
+			init_version=$( get_de_app_version 'systemctl' '^systemd' '2' )
+		fi
+	else
+		ls_run=$(ls /run)
+		# note: upstart-file-bridge.pid upstart-socket-bridge.pid upstart-udev-bridge.pid
+		if [[ -n $( /sbin/init --version 2>/dev/null | grep 'upstart' ) ]];then
+			init_type='Upstart'
+			# /sbin/init --version == init (upstart 1.12.1)
+			init_version=$( get_de_app_version 'init' 'upstart' '3' )
+		elif [[ -n $( type -p epoch ) ]];then
+			init_type='Epoch'
+			# epoch version == Epoch Init System 1.0.1 "Sage"
+			init_version=$( get_de_app_version 'epoch' '^Epoch' '4' )
+		# missing data: 
+		# http://smarden.org/runit/sv.8.html
+		elif [[ -e /sbin/runit-init || -e /etc/runit || -n $( type -p sv ) ]];then
+			init_type='runit' # lower case
+			# no data on version yet
+		elif [[ -f /etc/inittab ]];then
+			init_type='SysVinit'
+			if [[ -n $( type -p strings ) ]];then
+				strings_init_version="$( strings /sbin/init | grep -E 'version[[:space:]]+[0-9]' )"
+			fi
+			if [[ -n $strings_init_version ]];then
+				init_version=$( gawk '{print $2}' <<< "$strings_init_version" )
+			fi
+		# freebsd at least
+		elif [[ -f /etc/ttys ]];then
+			init_type='init (bsd)'
+		fi
+		
+		if [[ -n $( grep 'openrc' <<< "$ls_run" ) ]];then
+			rc_type='OpenRC'
+			# /sbin/openrc --version == openrc (OpenRC) 0.13
+			if [[ -n $( type -p openrc ) ]];then
+				rc_version=$( get_de_app_version 'openrc' '^openrc' '3' )
+			# /sbin/rc --version == rc (OpenRC) 0.11.8 (Gentoo Linux)
+			elif [[ -n $( type -p rc ) ]];then
+				rc_version=$( get_de_app_version 'rc' '^rc' '3' )
+			fi
+		## assume sysvrc, but this data is too buggy and weird and inconsistent to have meaning
+		# leaving this off for now
+# 		elif [[ -f /etc/inittab ]];then
+# 			rc_type='SysVrc'
+# 			# this is a guess that rc and init are same versions, may need updates / fixes
+# 			rc_version=$init_version
+		fi
+	fi
+	
+	IFS=$'\n'
+	
+	A_INIT_DATA=( 
+	"$init_type"
+	"$init_version"
+	"$rc_type"
+	"$rc_version"
+	"$runlevel"
+	"$default_runlevel" )
+	
+	IFS="$ORIGINAL_IFS"
+	
+	temp_array=${A_INIT_DATA[@]}
+	log_function_data "A_INIT_DATA: $temp_array"
+	
+	eval $LOGFE
+}
+
+get_kernel_version()
+{
+	eval $LOGFS
+	
+	local kernel_version='' ksplice_kernel_version=''
+	
+	kernel_version=$( uname -rm )
+	
+	if [[ -n $( type -p uptrack-uname ) && -n $kernel_version ]];then
+		ksplice_kernel_version=$( uptrack-uname -rm )
+		if [[ $kernel_version != $ksplice_kernel_version ]];then
+			kernel_version="$ksplice_kernel_version (ksplice)"
+		fi
+	fi
+	log_function_data "kernel_version: $kernel_version - ksplice_kernel_version: $ksplice_kernel_version"
+	
+	echo $kernel_version
+	
+	eval $LOGFE
+}
+
+# args: $1 - v/n 
 get_lspci_data()
 {
 	eval $LOGFS
-	local lspci_data="$( lspci -v | gawk '{
-		gsub(/\(prog-if[^)]*\)/,"")
-		print
-	}' )"
+	local lspci_data=''
+
+	if [[ $B_LSPCI == 'true' ]];then
+		lspci_data="$( lspci -$1 | gawk '{
+			gsub(/\(prog-if[^)]*\)/,"")
+			sub(/^0000:/, "", $0) # seen case where the 0000: is prepended, rare, but happens
+			print
+		}' )"
+	fi
 	
 	echo "$lspci_data"
-	log_function_data 'raw' "lspci_data:\n$lspci_data"
+	log_function_data 'raw' "lspci_data $1:\n$lspci_data"
+	eval $LOGFE
+}
+
+# args: $1 - busid
+get_lspci_chip_id()
+{
+	eval $LOGFS
+	
+	local chip_id=''
+	
+	chip_id=$( gawk '
+	/^'$1'/ {
+		if ( $3 != "" ) {
+			print $3
+		}
+	}' <<< "$Lspci_n_Data" )
+	
+	echo $chip_id
+	
 	eval $LOGFE
 }
 
+get_machine_data()
+{
+	eval $LOGFS
+	local temp_array='' separator='' id_file='' file_data='' array_string=''
+	local id_dir='/sys/class/dmi/id/' dmi_data='' 
+	local machine_files="
+	sys_vendor product_name product_version product_serial product_uuid 
+	board_vendor board_name board_version board_serial 
+	bios_vendor bios_version bios_date 
+	"
+
+	if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+		machine_files="$machine_files
+		chassis_vendor chassis_type chassis_version chassis_serial
+		"
+	fi
+	if [[ -d $id_dir ]];then
+		for id_file in $machine_files
+		do
+			file_data=''
+			if [[ -r $id_dir$id_file ]];then
+				file_data=$( gawk '
+				BEGIN {
+					IGNORECASE=1
+				}
+				{
+					gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
+					gsub(/,/, " ", $0)
+					# yes, there is a typo in a user data set, unknow
+					# Base Board Version|Base Board Serial Number
+					# Chassis Manufacturer|Chassis Version|Chassis Serial Number
+					# System manufacturer|System Product Name|System Version
+					# To Be Filled By O.E.M.
+					sub(/^Base Board .*|^Chassis .*|.*O\.E\.M\..*|.*OEM.*|^Not .*|^System .*|.*unknow.*|.*N\/A.*|none|^To be filled.*/, "", $0) 
+					gsub(/bios|acpi/, "", $0)
+					sub(/http:\/\/www.abit.com.tw\//, "Abit", $0)
+					gsub(/^ +| +$/, "", $0)
+					gsub(/ [ \t]+/, " ", $0)
+					print $0
+				}' < $id_dir$id_file )
+			fi
+			array_string="$array_string$separator$file_data"
+			separator=','
+		done
+	else
+		get_dmidecode_data
+		if [[ -n $DMIDECODE_DATA ]];then
+			if [[ $B_ROOT == 'true' ]];then
+				# this handles very old systems, like Lenny 2.6.26, with dmidecode, but no data
+				if [[ -n $( grep -i 'no smbios ' <<< "$DMIDECODE_DATA" ) ]];then
+					array_string='dmidecode-no-smbios-dmi-data'
+				# please note: only dmidecode version 2.11 or newer supports consistently the -s flag
+				else
+					array_string=$( gawk -F ':' '
+					BEGIN {
+						IGNORECASE=1
+						baseboardManufacturer=""
+						baseboardProductName=""
+						baseboardSerialNumber=""
+						baseboardVersion=""
+						biosReleaseDate=""
+						biosRevision="" # only available from dmidecode
+						biosRomSize="" # only available from dmidecode
+						biosVendor=""
+						biosVersion=""
+						chassisManufacturer=""
+						chassisSerialNumber=""
+						chassisType=""
+						chassisVersion=""
+						systemManufacturer=""
+						systemProductName=""
+						systemVersion=""
+						systemSerialNumber=""
+						systemUuid=""
+						bItemFound="" # we will only output if at least one item was found
+						fullString=""
+						testString=""
+						bSys=""
+						bCha=""
+						bBio=""
+						bBas=""
+					}
+					/^Bios Information/ {
+						while ( getline && !/^$/ ) {
+							if ( $1 ~ /^Release Date/ ) { biosReleaseDate=$2 }
+							if ( $1 ~ /^BIOS Revision/ ) { biosRevision=$2 }
+							if ( $1 ~ /^ROM Size/ ) { biosRomSize=$2 }
+							if ( $1 ~ /^Vendor/ ) { biosVendor=$2 }
+							if ( $1 ~ /^Version/ ) { biosVersion=$2 }
+						}
+						testString=biosReleaseDate biosRevision biosRomSize biosVendor biosVersion
+						if ( testString != ""  ) {
+							bItemFound="true"
+						}
+						bBio="true"
+					}
+					/^Base Board Information/ {
+						while ( getline && !/^$/ ) {
+							if ( $1 ~ /^Manufacturer/ ) { baseboardManufacturer=$2 }
+							if ( $1 ~ /^Product Name/ ) { baseboardProductName=$2 }
+							if ( $1 ~ /^Serial Number/ ) { baseboardSerialNumber=$2 }
+						}
+						testString=baseboardManufacturer baseboardProductName baseboardSerialNumber
+						if ( testString != ""  ) {
+							bItemFound="true"
+						}
+						bBas="true"
+					}
+					/^Chassis Information/ {
+						while ( getline && !/^$/ ) {
+							if ( $1 ~ /^Manufacturer/ ) { chassisManufacturer=$2 }
+							if ( $1 ~ /^Serial Number/ ) { chassisSerialNumber=$2 }
+							if ( $1 ~ /^Type/ ) { chassisType=$2 }
+							if ( $1 ~ /^Version/ ) { chassisVersion=$2 }
+						}
+						testString=chassisManufacturer chassisSerialNumber chassisType chassisVersion
+						if ( testString != ""  ) {
+							bItemFound="true"
+						}
+						bCha="true"
+					}
+					/^System Information/ {
+						while ( getline && !/^$/ ) {
+							if ( $1 ~ /^Manufacturer/ ) { systemManufacturer=$2 }
+							if ( $1 ~ /^Product Name/ ) { systemProductName=$2 }
+							if ( $1 ~ /^Version/ ) { systemVersion=$2 }
+							if ( $1 ~ /^Serial Number/ ) { systemSerialNumber=$2 }
+							if ( $1 ~ /^UUID/ ) { systemUuid=$2 }
+						}
+						testString=systemManufacturer systemProductName systemVersion systemSerialNumber systemUuid
+						if ( testString != ""  ) {
+							bItemFound="true"
+						}
+						bSys="true"
+					}
+					( bSys == "true" && bCha="true" && bBio == "true" && bBas == "true" ) {
+						exit # stop the loop
+					}
+					END {
+						if ( bItemFound == "true" ) {
+							fullString = systemManufacturer "," systemProductName "," systemVersion "," systemSerialNumber 
+							fullString = fullString "," systemUuid "," baseboardManufacturer "," baseboardProductName 
+							fullString = fullString "," baseboardVersion "," baseboardSerialNumber "," biosVendor
+							fullString = fullString "," biosVersion "," biosReleaseDate "," chassisManufacturer
+							fullString = fullString "," chassisType "," chassisVersion "," chassisSerialNumber 
+							fullString = fullString ","  biosRevision "," biosRomSize
+							
+							print fullString
+						}
+					}' <<< "$DMIDECODE_DATA" )
+				fi
+			else
+				array_string='dmidecode-non-root-user'
+			fi
+		fi
+	fi
+	IFS=','
+	A_MACHINE_DATA=( $array_string )
+	IFS="$ORIGINAL_IFS"
+	temp_array=${A_MACHINE_DATA[@]}
+# 	echo ${temp_array[@]}
+	log_function_data "A_MACHINE_DATA: $temp_array"
+	eval $LOGFE
+}
+# B_ROOT='true';get_machine_data;exit
 ## return memory used/installed
 get_memory_data()
 {
 	eval $LOGFS
-	local memory=''
+	local memory='' memory_full='' 
 	if [[ $B_MEMINFO_FILE == 'true' ]];then
 		memory=$( gawk '
 		/^MemTotal:/ {
@@ -2808,10 +5877,48 @@ get_memory_data()
 			notused+=$2
 		}
 		END {
-			used = tot-notused
+			used = tot - notused
 			printf("%.1f/%.1fMB\n", used/1024, tot/1024)
 		}' $FILE_MEMINFO )
 		log_function_data 'cat' "$FILE_MEMINFO"
+	elif [[ $B_SYSCTL == 'true' && -n $Sysctl_a_Data ]];then
+		local gawk_fs=': '
+	
+		if [[ $BSD_VERSION == 'openbsd' ]];then
+			gawk_fs='='
+		fi
+		memory=$( grep -i 'mem' <<< "$Sysctl_a_Data" | gawk -F "$gawk_fs"  '
+		BEGIN {
+			realMemory=""
+			freeMemory=""
+		}
+		# freebsd seems to use bytes here
+		/^hw.physmem/ {
+			gsub(/^[^0-9]+|[^0-9]+$/,"",$2)
+			realMemory = $2/1024
+			if ( freeMemory != "" ) {
+				exit
+			}
+		}
+		# But, it uses K here. Openbsd does not seem to have this item
+		# this can be either: Free Memory OR Free Memory Pages
+		$1 ~ /^Free Memory/ {
+			gsub(/[^0-9]/,"",$NF)
+			freeMemory = $NF
+			if ( realMemory != "" ) {
+				exit
+			}
+		}
+		END {
+			# hack: temp fix for openbsd: in case no free mem was detected but we have physmem
+			if ( freeMemory == "" && realMemory != "" ) {
+				printf("NA/%.1fMB\n", realMemory/1024)
+			}
+			else if ( freeMemory != "" && realMemory != "" ) {
+				used = realMemory - freeMemory
+				printf("%.1f/%.1fMB\n", used/1024, realMemory/1024)
+			}
+		}' )
 	fi
 	echo "$memory"
 	log_function_data "memory: $memory"
@@ -2853,16 +5960,19 @@ get_networking_data()
 {
 	eval $LOGFS
 	
+	local B_USB_NETWORKING='false' temp_array=''
+	
 	IFS=$'\n'
-	A_NETWORK_DATA=( $( echo "$Lspci_Data" | gawk '
+	A_NETWORK_DATA=( $( 
+	echo "$Lspci_v_Data" | gawk '
 	BEGIN {
 		IGNORECASE=1
 		counter=0 # required to handle cases of > 1 instance of the same chipset
 	}
-	/^[0-9a-f:.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:.]+ [^:]+: .*(ethernet|network).*$/ {
+	/^[0-9a-f:\.]+ (ethernet|network) (controller|bridge)/ || /^[0-9a-f:\.]+ [^:]+: .*(ethernet|network).*$/ {
 		nic=gensub(/^[0-9a-f:\.]+ [^:]+: (.+)$/,"\\1","g",$0)
-		gsub(/realtek semiconductor/, "Realtek", nic)
-		gsub(/davicom semiconductor/, "Davicom", nic)
+		#gsub(/realtek semiconductor/, "Realtek", nic)
+		#gsub(/davicom semiconductor/, "Davicom", nic)
 		# The doublequotes are necessary because of the pipes in the variable.
 		gsub(/'"$BAN_LIST_NORMAL"'/, "", nic)
 		gsub(/,/, " ", nic)
@@ -2895,6 +6005,7 @@ get_networking_data()
 			usePorts=""
 			useModules=""
 			usePciBusId=""
+
 			if ( eth[i] > 1 ) {
 				a[j] = eth[i] "x " i
 			}
@@ -2921,9 +6032,203 @@ get_networking_data()
 			print a[j] "," useDrivers "," usePorts "," useModules, "," usePciBusId
 			j++
 		}
-	}') )
+	}' ) )
 	IFS="$ORIGINAL_IFS"
-	log_function_data "A_NETWORK_DATA: ${A_NETWORK_DATA[@]}"
+	get_networking_usb_data
+	if [[ $B_SHOW_ADVANCED_NETWORK == 'true' || $B_USB_NETWORKING == 'true' ]];then
+		get_network_advanced_data
+	fi
+	temp_array=${A_NETWORK_DATA[@]}
+	log_function_data "A_NETWORK_DATA: $temp_array"
+	
+	eval $LOGFE
+}
+
+get_network_advanced_data()
+{
+	eval $LOGFS
+	local a_network_adv_working='' if_path='' working_path='' working_uevent_path='' dir_path=''
+	local if_id='' speed='' duplex='' mac_id='' oper_state=''  chip_id=''
+	local usb_data='' usb_vendor='' usb_product='' product_path='' driver_test=''
+	
+	for (( i=0; i < ${#A_NETWORK_DATA[@]}; i++ ))
+	do
+		IFS=","
+		a_network_adv_working=( ${A_NETWORK_DATA[i]} )
+		# reset these every go round
+		driver_test=''
+		if_id='' 
+		speed='' 
+		duplex='' 
+		mac_id='' 
+		oper_state=''
+		usb_data=''
+		chip_id=''
+		if [[ -z $( grep '^usb-' <<< ${a_network_adv_working[4]} ) ]];then
+			# note although this may exist technically don't use it, it's a virtual path
+			# and causes weird cat errors when there's a missing file as well as a virtual path
+			# /sys/bus/pci/devices/0000:02:02.0/net/eth1
+			# real paths are: /sys/devices/pci0000:00/0000:00:1e/0/0000:02:02.0/net/eth1/uevent
+			# and on older debian kernels: /sys/devices/pci0000:00/0000:02:02.0/net:eth1/uevent
+			# but broadcom shows this sometimes:
+			# /sys/devices/pci0000:00/0000:00:03.0/0000:03:00.0/ssb0:0/uevent:['DRIVER=b43', 'MODALIAS=ssb:v4243id0812rev0D']:
+			working_path="/sys/bus/pci/devices/0000:${a_network_adv_working[4]}"
+			# now we want the real one, that xiin also displays, without symbolic links.
+			if [[ -e $working_path ]];then
+				working_path=$( readlink -f $working_path 2>/dev/null )
+				# sometimes there is another directory between the path and /net
+				if [[ ! -e $working_path/net ]];then
+					# using find here, probably will need to also use it in usb part since the grep
+					# method seems to not be working now. Slice off the rest, which leaves the basic path
+					working_path=$( find $working_path/*/net/*/uevent 2>/dev/null | \
+					sed 's|/net.*||' )
+				fi
+			fi
+			# working_path=$( ls /sys/devices/pci*/*/0000:${a_network_adv_working[4]}/net/*/uevent  )
+		else
+			# now we'll use the actual vendor:product string instead
+			usb_data=${a_network_adv_working[10]}
+			usb_vendor=$( cut -d ':' -f 1 <<< $usb_data )
+			usb_product=$( cut -d ':' -f 2 <<< $usb_data )
+			# this grep returns the path plus the contents of the file, with a colon separator, so slice that off
+			# /sys/devices/pci0000:00/0000:00:1a.0/usb1/1-1/1-1.1/idVendor
+			working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/*/idVendor | \
+			sed -e "s/idVendor:$usb_vendor//"  -e '/driver/d' )
+			# try an alternate path if first one doesn't work
+			# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/idVendor
+			if [[ -z $working_path ]];then
+				working_path=$( grep -s "$usb_vendor" /sys/devices/pci*/*/usb*/*/idVendor | \
+				sed -e "s/idVendor:$usb_vendor//"  -e '/driver/d' )
+				product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/idProduct | \
+				sed -e "s/idProduct:$usb_product//" -e '/driver/d' )
+			else
+				product_path=$( grep -s "$usb_product" /sys/devices/pci*/*/usb*/*/*/idProduct | \
+				sed -e "s/idProduct:$usb_product//" -e '/driver/d' )
+			fi
+			
+			# make sure it's the right product/vendor match here, it will almost always be but let's be sure
+			if [[ -n $working_path && -n $product_path ]] && [[ $working_path == $product_path ]];then
+			#if [[ -n $working_path ]];then
+				# now ls that directory and get the numeric starting sub directory and that should be the full path
+				# to the /net directory part
+				dir_path=$( ls ${working_path} 2>/dev/null | grep -sE '^[0-9]' )
+				working_uevent_path="${working_path}${dir_path}"
+			fi
+		fi
+		# /sys/devices/pci0000:00/0000:00:1d.0/usb2/2-1/2-1.2/2-1.2:1.0/uevent grep for DRIVER=
+		# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/1-1:1.0/uevent
+		if [[ -n $usb_data ]];then
+			driver_test=$( grep -si 'DRIVER=' $working_uevent_path/uevent | cut -d '=' -f 2 )
+			if [[ -n $driver_test ]];then
+				a_network_adv_working[1]=$driver_test
+			fi
+		fi
+		log_function_data "PRE: working_path: $working_path\nworking_uevent_path: $working_uevent_path"
+		
+		# this applies in two different cases, one, default, standard, two, for usb, this is actually
+		# the short path, minus the last longer numeric directory name, ie: 
+		# from debian squeeze 2.6.32-5-686: 
+		# /sys/devices/pci0000:00/0000:00:0b.1/usb1/1-1/net/wlan0/address
+		if [[ -e $working_path/net ]];then
+			if_path=$( ls $working_path/net 2>/dev/null )
+			if_id=$if_path
+			working_path=$working_path/net/$if_path
+		# this is the normal usb detection if the first one didn't work
+		elif [[ -n $usb_data && -e $working_uevent_path/net ]];then
+			if_path=$( ls $working_uevent_path/net 2>/dev/null )
+			if_id=$if_path
+			working_path=$working_uevent_path/net/$if_path
+		# 2.6.32 debian lenny kernel shows not: /net/eth0 but /net:eth0
+		else
+			if_path=$( ls $working_path 2>/dev/null | grep 'net:' )
+			if_id=$( cut -d ':' -f 2 <<< "$if_path" )
+			working_path=$working_path/$if_path
+		fi
+		log_function_data "POST: working_path: $working_path\nif_path: $if_path - if_id: $if_id"
+		
+		if [[ -n $if_path ]];then
+			if [[ -r $working_path/speed ]];then
+				speed=$( cat $working_path/speed 2>/dev/null )
+			fi
+			if [[ -r $working_path/duplex ]];then
+				duplex=$( cat $working_path/duplex 2>/dev/null )
+			fi
+			if [[ -r $working_path/address ]];then
+				mac_id=$( cat $working_path/address 2>/dev/null )
+			fi
+			if [[ -r $working_path/operstate ]];then
+				oper_state=$( cat $working_path/operstate 2>/dev/null )
+			fi
+		fi
+		
+		if [[ -n ${a_network_adv_working[10]} ]];then
+			chip_id=${a_network_adv_working[10]}
+		fi
+		A_NETWORK_DATA[i]=${a_network_adv_working[0]}","${a_network_adv_working[1]}","${a_network_adv_working[2]}","${a_network_adv_working[3]}","${a_network_adv_working[4]}","$if_id","$oper_state","$speed","$duplex","$mac_id","$chip_id
+		IFS="$ORIGINAL_IFS"
+	done
+
+	eval $LOGFE
+}
+
+get_networking_usb_data()
+{
+	eval $LOGFS
+	local lsusb_path='' lsusb_data='' a_usb='' array_count=''
+	
+	# now we'll check for usb wifi, a work in progress
+	# USB_NETWORK_SEARCH
+	# alsa usb detection by damentz
+	# for every sound card symlink in /proc/asound - display information about it
+	lsusb_path=$( type -p lsusb )
+	# if lsusb exists, the file is a symlink, and contains an important usb exclusive file: continue
+	if [[ -n $lsusb_path ]]; then
+		# send error messages of lsusb to /dev/null as it will display a bunch if not a super user
+		lsusb_data="$( $lsusb_path 2>/dev/null )"
+		# also, find the contents of usbid in lsusb and print everything after the 7th word on the
+		# corresponding line. Finally, strip out commas as they will change the driver :)
+		if [[ -n $lsusb_data ]];then
+			IFS=$'\n'
+			a_usb=( $( 
+			gawk '
+			BEGIN {
+				IGNORECASE=1
+				string=""
+				separator=""
+			}
+			/'"$USB_NETWORK_SEARCH"'/ && !/bluetooth| hub|keyboard|mouse|printer| ps2|reader|scan|storage/ {
+				string=""
+				gsub( /,/, " ", $0 )
+				gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
+				gsub(/ [ \t]+/, " ", $0)
+				#sub(/realtek semiconductor/, "Realtek", $0)
+				#sub(/davicom semiconductor/, "Davicom", $0)
+				#sub(/Belkin Components/, "Belkin", $0)
+				
+				for ( i=7; i<= NF; i++ ) {
+					string = string separator $i
+					separator = " "
+				}
+				if ( $2 != "" ){
+					sub(/:/, "", $4 )
+					print string ",,,,usb-" $2 "-" $4 ",,,,,," $6
+				}
+			}' <<< "$lsusb_data" ) )
+			IFS="$ORIGINAL_IFS"
+			if [[ ${#a_usb[@]} -gt 0 ]];then
+				array_count=${#A_NETWORK_DATA[@]}
+				for (( i=0; i < ${#a_usb[@]}; i++ ))
+				do
+					A_NETWORK_DATA[$array_count]=${a_usb[i]}
+					((array_count++))
+				done
+				# need this to get the driver data for -N regular output, but no need
+				# to run the advanced stuff unless required
+				B_USB_NETWORKING='true'
+			fi
+		fi
+	fi
+# 	echo $B_USB_NETWORKING
 	eval $LOGFE
 }
 
@@ -2932,14 +6237,23 @@ get_networking_wan_ip_data()
 	eval $LOGFS
 	local ip=''
 
-	# get ip using wget redirect to stdout. This is a clean, text only IP output url.
-	ip=$( wget -q -O - http://smxi.org/opt/ip.php | gawk -F 'is: ' '{
+	# get ip using wget redirect 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.
+	# awk has bad regex handling so checking it with grep -E instead
+	# ip=$( echo  2001:0db8:85a3:0000:0000:8a2e:0370:7334 | gawk  --re-interval '
+	# ip=$( wget -q -O - $WAN_IP_URL | gawk  --re-interval '
+	ip=$( wget -t 1 -T $WGET_TIMEOUT -q -O - $WAN_IP_URL | gawk  --re-interval '
+	{
 		#gsub("\n","",$2")
-		print $2
+		print $NF
 	}' )
-
+	# validate the data
 	if [[ -z $ip ]];then
 		ip='None Detected!'
+	elif [[ -z $( grep -Es \
+	'^([0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}|[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4}:[[:alnum:]]{0,4})$' <<< $ip ) ]];then
+		ip='IP Source Corrupt!'
 	fi
 	echo "$ip"
 	log_function_data "ip: $ip"
@@ -2950,94 +6264,392 @@ get_networking_local_ip_data()
 {
 	eval $LOGFS
 	
-	local ifconfig_path=$( type -p ifconfig )
-	
-	# lack of ifconfig will throw an error only upon it's usage
-	if [[ -n $ifconfig_path ]];then
-		IFS=$'\n'
-		A_INTERFACES_DATA=( $( $ifconfig_path | gawk '
+	local ip_tool_command=$( type -p ip )
+	local temp_array='' ip_tool='ip' ip_tool_data=''
+	# the chances for all new systems to have ip by default are far higher than
+	# the deprecated ifconfig. Only try for ifconfig if ip is not present in system
+	if [[ -z $ip_tool_command ]];then
+		ip_tool_command=$( type -p ifconfig )
+		ip_tool='ifconfig'
+	else
+		ip_tool_command="$ip_tool_command addr"
+	fi
+	if [[ -n "$ip_tool_command" ]];then
+		if [[ $ip_tool == 'ifconfig' ]];then
+			ip_tool_data="$( $ip_tool_command | gawk '
+			{
+				line=gensub(/^([a-z]+[0-9][:]?[[:space:]].*)/, "\n\\1", $0)
+				print line
+			}' )"
+		# note, ip addr does not have proper record separation, so creating new lines explicitly here at start
+		# of each IF record item. Also getting rid of the unneeded numeric line starters, now it can be parsed 
+		# like ifconfig more or less
+		elif [[ $ip_tool == 'ip' ]];then
+			ip_tool_data="$( eval ${ip_tool_command} | sed 's/^[0-9]\+:[[:space:]]\+/\n/' )"
+		fi
+	fi
+	if [[ -z $ip_tool_command ]];then
+		A_INTERFACES_DATA=( "Interfaces program 'ip' missing. Please check: $SCRIPT_NAME --recommends" )
+	elif [[ -n "$ip_tool_data" ]];then
+		IFS=$'\n' # $ip_tool_command
+		A_INTERFACES_DATA=( $( 
+		gawk -v ipTool=$ip_tool -v bsdType=$BSD_TYPE '
 		BEGIN {
 			IGNORECASE=1
+			interface=""
+			ifIp=""
+			ifIpV6=""
+			ifMask=""
+		}
+		# skip past the lo item
+		/^lo/ {
+			while (getline && !/^$/ ) {
+				# do nothing, just get past this entry item
+			}
 		}
-		$0 !~ /^lo/ {
+		/^[a-zA-Z]+[0-9]/ {
 			# not clear on why inet is coming through, but this gets rid of it
 			# as first line item.
+			gsub(/,/, " ", $0)
+			gsub(/^ +| +$/, "", $0)
+			gsub(/ [ \t]+/, " ", $0)
 			interface = $1
-			gsub(/,/, " ", interface)
-			gsub(/^ +| +$/, "", interface)
-			gsub(/ [ \t]+/, " ", interface)
-
+			# prep this this for ip addr: eth0: 
+			sub(/:/, "", interface)
+			ifIp=""
+			ifIpV6=""
+			ifMask=""
 			aInterfaces[interface]++
-			while (getline && !/^$/) {
-				if (/inet addr:/) {
-					ipAddresses[interface] = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
+
+			while (getline && !/^$/ ) {
+				if ( ipTool == "ifconfig" ) {
+					if (/inet addr:/) {
+						ifIp = gensub( /addr:([0-9\.]+)/, "\\1", "g", $2 )
+						if (/mask:/) {
+							ifMask = gensub( /mask:([0-9\.]+)/, "\\1", "g", $NF )
+						}
+					}
+					if (/inet6 addr:/) {
+						ifIpV6 = $3
+					}
+					if ( bsdType == "bsd" ) {
+						if ( $1 == "inet" ) {
+							ifIp = $2
+							if ( $3 == "netmask" ) {
+								ifMask = $4
+							}
+						}
+						if ( $0 ~ /inet6.*%/ ) {
+							sub(/%.*/,"",$2)
+							ifIpV6 = $2
+						}
+					}
+				}
+				else if ( ipTool == "ip" ) {
+					if ( $1 == "inet" ) {
+						ifIp = $2
+					}
+					if ( $1 == "inet6" ) {
+						ifIpV6 = $2
+					}
 				}
 			}
+			# slice off the digits that are sometimes tacked to the end of the address, 
+			# like: /64 or /24
+			sub(/\/[0-9]+/, "", ifIp)
+			sub(/\/[0-9]+/, "", ifIpV6)
+			ipAddresses[interface] = ifIp "," ifMask "," ifIpV6
 		}
-
 		END {
 			j=0
 			for (i in aInterfaces) {
-				useInterfaceIp = ""
+				ifData = ""
 				a[j] = i
 				if (ipAddresses[i] != "") {
-					useInterfaceIp = ipAddresses[i]
+					ifData = ipAddresses[i]
 				}
 				# create array primary item for master array
 				# tested needed to avoid bad data from above, if null it is garbage
 				# this is the easiest way to handle junk I found, improve if you want
-				if ( useInterfaceIp != "" ) {
-					print a[j] "," useInterfaceIp
+				if ( ifData != "" ) {
+					print a[j] "," ifData
 				}
 				j++
 			}
-		}') )
+		}' <<< "$ip_tool_data" ) )
 		IFS="$ORIGINAL_IFS"
 	else
-		A_INTERFACES_DATA=( "Interfaces tool requires missing app: ifconfig" )
+		A_INTERFACES_DATA=( "Interfaces program $ip_tool present but created no data. " )
 	fi
-	log_function_data "A_INTERFACES_DATA: ${A_INTERFACES_DATA[@]}"
+	temp_array=${A_INTERFACES_DATA[@]}
+	log_function_data "A_INTERFACES_DATA: $temp_array"
 	eval $LOGFE
 }
+# get_networking_local_ip_data;exit
 
-get_partition_data()
+# get_networking_local_ip_data;exit
+get_optical_drive_data()
 {
 	eval $LOGFS
-	#local excluded_file_types='--exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660'
-	# df doesn't seem to work in script with variables like at the command line
-	local main_partition_data="$( df -h -T --exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660 )"
-	local swap_data="$( swapon -s )"
-	log_function_data 'raw' "main_partition_data:\n$main_partition_data\n\nswap_data:\n$swap_data"
 	
-	IFS=$'\n'
-	# sample line: /dev/sda2     ext3     15G  8.9G  4.9G  65% /home
-	# $NF = partition name; $(NF - 4) = partition size; $(NF - 3) = used, in gB; $(NF - 1) = percent used
-	## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if
-	## the first field is too long, it will occupy its own line, this way we are getting only the needed data
-	A_PARTITION_DATA=( $( echo "$main_partition_data" | gawk '
-	BEGIN {
-		IGNORECASE=1
-	}
-	# this has to be nulled for every iteration so it does not retain value from last iteration
-	devBase=""
-	# this is required because below we are subtracting from NF, so it has to be > 5
-	# the real issue is long file system names that force the wrap of df output: //fileserver/main
-	# but we still need to handle more dynamically long space containing file names, but later.
-	( NF < 6 ) && ( $0 !~ /[0-9]+\%/ ) {
-		# set the dev location here for cases of wrapped output
-		if ( NF == 1 ){
-			devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
-		}
-		getline
-	}
-	# next set devBase if it didn not get set above here
-	( $1 ~ /^\/dev\// ) && ( devBase == "" ) {
-		devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
-	}
-	# this handles yet another fredforfaen special case where a mounted drive
-	# has the search string in its name
-	$NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ {
-		print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," $(NF - 5) "," devBase 
+	local temp_array='' sys_uevent_path='' proc_cdrom='' link_list=''
+	local separator='' linked='' disk='' item_string='' proc_info_string='' 
+	local dev_disks_links="$( ls /dev/dvd* /dev/cd* /dev/scd* 2>/dev/null  )"
+	# get the actual disk dev location, first try default which is easier to run, need to preserve line breaks
+	local dev_disks_real="$( echo "$dev_disks_links" | xargs -L 1 readlink 2>/dev/null | sort -u )"
+	# Some systems don't support xargs -L so we need to do it manually
+	if [[ -z $dev_disks_real ]];then
+		for linked in $dev_disks_links
+		do
+			disk=$( readlink $linked 2>/dev/null )
+			if [[ -n $disk ]];then
+				disk=$( basename $disk ) # puppy shows this as /dev/sr0, not sr0
+				if [[ -z $dev_disks_real || -z $( grep $disk <<< $dev_disks_real ) ]];then
+					# need line break IFS for below, no white space
+					dev_disks_real="$dev_disks_real$separator$disk"
+					separator=$'\n'
+				fi
+			fi
+		done
+		dev_disks_real="$( sort -u <<< "$dev_disks_real" )"
+		linked=''
+		disk=''
+		separator=''
+	fi
+
+	# A_OPTICAL_DRIVE_DATA indexes: not going to use all these, but it's just as easy to build the full
+	# data array and use what we need from it as to update it later to add features or items
+	# 0 - true dev path, ie, sr0, hdc
+	# 1 - dev links to true path
+	# 2 - device vendor - for hdx drives, vendor model are one string from proc
+	# 3 - device model
+	# 4 - device rev version
+	# 5 - speed
+	# 6 - multisession support
+	# 7 - MCN support
+	# 8 - audio read
+	# 9 - cdr
+	# 10 - cdrw
+	# 11 - dvd read
+	# 12 - dvdr
+	# 13 - dvdram
+	# 14 - state
+
+	if [[ -n $dev_disks_real ]];then
+		if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
+			proc_cdrom="$( cat /proc/sys/dev/cdrom/info 2>/dev/null )"
+		fi
+		IFS=$'\n'
+		A_OPTICAL_DRIVE_DATA=( $(
+		for disk in $dev_disks_real
+		do
+			for linked in $dev_disks_links 
+			do
+				if [[ -n $( readlink $linked | grep $disk ) ]];then
+					linked=$( basename $linked )
+					link_list="$link_list$separator$linked"
+					separator='~'
+				fi
+			done
+			item_string="$disk,$link_list"
+			link_list=''
+			linked=''
+			separator=''
+			vendor=''
+			model=''
+			proc_info_string=''
+			rev_number=''
+			state=""
+			sys_path=''
+			# this is only for new sd type paths in /sys, otherwise we'll use /proc/ide
+			if [[ -z $( grep '^hd' <<< $disk ) ]];then
+				sys_path=$( ls /sys/devices/pci*/*/host*/target*/*/block/$disk/uevent 2>/dev/null | sed "s|/block/$disk/uevent||" )
+				# no need to test for errors yet, probably other user systems will require some alternate paths though
+				if [[ -n $sys_path ]];then
+					vendor=$( cat $sys_path/vendor 2>/dev/null )
+					model=$( cat $sys_path/model 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
+					state=$( cat $sys_path/state 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
+					rev_number=$( cat $sys_path/rev 2>/dev/null | sed 's/^[[:space:]]*//;s/[[:space:]]*$//;s/,//g' )
+				fi
+			elif [[ -e /proc/ide/$disk/model ]];then
+				vendor=$( cat /proc/ide/$disk/model 2>/dev/null )
+			fi
+			if [[ -n $vendor ]];then
+				vendor=$( gawk '
+				BEGIN {
+					IGNORECASE=1
+				}
+				{
+					gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
+					sub(/TSSTcorp/, "TSST ", $0) # seen more than one of these weird ones
+					gsub(/,/, " ", $0)
+					gsub(/^[[:space:]]*|[[:space:]]*$/, "", $0)
+					gsub(/ [[:space:]]+/, " ", $0)
+					print $0
+				}'	<<< $vendor )
+			fi
+			# this needs to run no matter if there's proc data or not to create the array comma list
+			if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
+				proc_info_string=$( gawk -v diskId=$disk '
+				BEGIN {
+					IGNORECASE=1
+					position=""
+					speed=""
+					multisession=""
+					mcn=""
+					audio=""
+					cdr=""
+					cdrw=""
+					dvd=""
+					dvdr=""
+					dvdram=""
+				}
+				# first get the position of the device name from top field
+				# we will use this to get all the other data for that column
+				/drive name:/ {
+					for ( position=3; position <= NF; position++ ) {
+						if ( $position == diskId ) {
+							break
+						}
+					}
+				}
+				/drive speed:/ {
+					speed = $position
+				}
+				/Can read multisession:/ {
+					multisession=$( position + 1 )
+				}
+				/Can read MCN:/ {
+					mcn=$( position + 1 )
+				}
+				/Can play audio:/ {
+					audio=$( position + 1 )
+				}
+				/Can write CD-R:/ {
+					cdr=$( position + 1 )
+				}
+				/Can write CD-RW:/ {
+					cdrw=$( position + 1 )
+				}
+				/Can read DVD:/ {
+					dvd=$( position + 1 )
+				}
+				/Can write DVD-R:/ {
+					dvdr=$( position + 1 )
+				}
+				/Can write DVD-RAM:/ {
+					dvdram=$( position + 1 )
+				}
+				END {
+					print speed "," multisession "," mcn "," audio "," cdr "," cdrw "," dvd "," dvdr "," dvdram
+				}
+				' <<< "$proc_cdrom" )
+			fi
+			item_string="$item_string,$vendor,$model,$rev_number,$proc_info_string,$state"
+			echo $item_string
+		done \
+		) )
+		IFS="$ORIGINAL_IFS"
+	fi
+	temp_array=${A_OPTICAL_DRIVE_DATA[@]}
+	log_function_data "A_OPTICAL_DRIVE_DATA: $temp_array"
+	eval $LOGFE
+}
+
+get_partition_data()
+{
+	eval $LOGFS
+	
+	local a_partition_working='' dev_item='' temp_array='' dev_working_item='' 
+	local swap_data='' df_string='' main_partition_data='' df_test='' fs_type=''
+	local mount_data='' dev_bsd_item=''
+	#local excluded_file_types='--exclude-type=aufs --exclude-type=tmpfs --exclude-type=iso9660'
+	# df doesn't seem to work in script with variables like at the command line
+	# added devfs linprocfs sysfs fdescfs which show on debian kfreebsd kernel output
+	if [[ -z $BSD_TYPE ]];then
+		swap_data="$( swapon -s 2>/dev/null )"
+		df_string='df -h -T -P --exclude-type=aufs --exclude-type=devfs --exclude-type=devtmpfs 
+		--exclude-type=fdescfs --exclude-type=iso9660 --exclude-type=linprocfs --exclude-type=procfs
+		--exclude-type=squashfs --exclude-type=sysfs --exclude-type=tmpfs --exclude-type=unionfs'
+	else
+		swap_data="$( swapctl -l 2>/dev/null )"
+		# default size is 512, -H only for size in human readable format
+		# older bsds don't support -T, pain, so we'll use partial output there
+		df_test=$( df -H -T 2>/dev/null )
+		if [[ -n $df_test ]];then
+			df_string='df -H -T'
+		else
+			df_string='df -H'
+		fi
+	fi
+	main_partition_data="$( eval $df_string )"
+	# set dev disk label/mapper/uuid data globals
+	get_partition_dev_data 'label'
+	get_partition_dev_data 'mapper'
+	get_partition_dev_data 'uuid'
+	
+	log_function_data 'raw' "main_partition_data:\n$main_partition_data\n\nswap_data:\n$swap_data"
+	
+	# new kernels/df have rootfs and / repeated, creating two entries for the same partition
+	# so check for two string endings of / then slice out the rootfs one, I could check for it
+	# before slicing it out, but doing that would require the same action twice re code execution
+	if [[ $( grep -cs '[[:space:]]/$' <<< "$main_partition_data" ) -gt 1 ]];then
+		main_partition_data="$( grep -vs '^rootfs' <<< "$main_partition_data" )"
+	fi
+	log_function_data 'raw' "main_partition_data_post_rootfs:\n$main_partition_data\n\nswap_data:\n$swap_data"
+	IFS=$'\n'
+	# sample line: /dev/sda2     ext3     15G  8.9G  4.9G  65% /home
+	# $NF = partition name; $(NF - 4) = partition size; $(NF - 3) = used, in gB; $(NF - 1) = percent used
+	## note: by subtracting from the last field number NF, we avoid a subtle issue with LVM df output, where if
+	## the first field is too long, it will occupy its own line, this way we are getting only the needed data
+	A_PARTITION_DATA=( $( echo "$main_partition_data" | gawk -v bsdType=$BSD_TYPE '
+	BEGIN {
+		IGNORECASE=1
+		fileSystem=""
+	}
+	# this has to be nulled for every iteration so it does not retain value from last iteration
+	devBase=""
+	# skipping these file systems because bsds do not support df --exclude-type=<fstype>
+	# note that using $1 to handle older bsd df, which do not support -T. This will not be reliable but we will see
+	( bsdType != "" ) {
+		# skip if non disk/partition, or if raid primary id, which will not have a / in it
+		if ( $1 ~ /^(aufs|devfs|devtmpfs|fdescfs|iso9660|linprocfs|procfs|squashfs|sysfs|tmpfs|type|unionfs)$/ || 
+		$1 ~ /^([^\/]+)$/ ) {
+			# note use next, not getline or it does not work right
+			next 
+		}
+	}
+	# this is required because below we are subtracting from NF, so it has to be > 5
+	# the real issue is long file system names that force the wrap of df output: //fileserver/main
+	# but we still need to handle more dynamically long space containing file names, but later.
+	# Using df -P should fix this, ie, no wrapping of line lines, but leaving this for now
+	( NF < 6 ) && ( $0 !~ /[0-9]+%/ ) {
+		# set the dev location here for cases of wrapped output
+		if ( NF == 1 ) {
+			devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
+		}
+		getline
+	}
+	
+	# next set devBase if it didn not get set above here
+	( devBase == "" ) && ( $1 ~ /^\/dev\/|:\/|\/\// ) {
+		devBase=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
+	}
+	# this handles zfs type devices/partitions, which do not start with / but contain /
+	( bsdType != "" && devBase == "" && $1 ~ /^[^\/]+\/.+/ ) {
+		devBase=gensub( /^([^\/]+\/)([^\/]+)$/, "non-dev-\\1\\2", 1, $1 )
+	}
+	# this handles yet another fredforfaen special case where a mounted drive
+	# has the search string in its name
+	$NF ~ /^\/$|^\/boot$|^\/var$|^\/home$|^\/tmp$|^\/usr$/ {
+		# note, older df in bsd do not have file system column
+		if ( NF == "7" && $(NF - 1) ~ /[0-9]+%/ ) {
+			fileSystem=$(NF - 5)
+		}
+		else {
+			fileSystem=""
+		}
+		print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",main," fileSystem "," devBase 
 	}
 	# skip all these, including the first, header line. Use the --exclude-type
 	# to handle new filesystems types we do not want listed here
@@ -3045,39 +6657,134 @@ get_partition_data()
 		# this is to avoid file systems with spaces in their names, that will make
 		# the test show the wrong data in each of the fields, if no x%, then do not use
 		# using 3 cases, first default, standard, 2nd, 3rd, handles one and two spaces in name
-		if ( $(NF - 1) ~ /[0-9]+\%/ ) {
-			print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," $(NF - 5) "," devBase 
+		if ( $(NF - 1) ~ /[0-9]+%/ ) {
+			# note, older df in bsd do not have file system column
+			if ( NF == "7" ) {
+				fileSystem=$(NF - 5)
+			}
+			else {
+				fileSystem=""
+			}
+			print $NF "," $(NF - 4) "," $(NF - 3) "," $(NF - 1) ",secondary," fileSystem "," devBase 
 		}
 		# these two cases construct the space containing name
-		else if ( $(NF - 2) ~ /[0-9]+\%/ ) {
-			print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," $(NF - 6) "," devBase
+		else if ( $(NF - 2) ~ /[0-9]+%/ ) {
+			# note, older df in bsd do not have file system column
+			if ( NF == "8" && $(NF - 6) !~ /^[0-9]+/ ) {
+				fileSystem=$(NF - 6)
+			}
+			else {
+				fileSystem=""
+			}
+			print $(NF - 1) " " $NF "," $(NF - 5) "," $(NF - 4) "," $(NF - 2) ",secondary," fileSystem "," devBase
 		}
-		else if ( $(NF - 3) ~ /[0-9]+\%/ ) {
-			print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," $(NF - 7) "," devBase 
+		else if ( $(NF - 3) ~ /[0-9]+%/ ) {
+			# note, older df in bsd do not have file system column
+			if ( NF == "9" && $(NF - 7) !~ /^[0-9]+/ ) {
+				fileSystem=$(NF - 7)
+			}
+			else {
+				fileSystem=""
+			}
+			print $(NF - 2) " " $(NF - 1) " " $NF "," $(NF - 6) "," $(NF - 5) "," $(NF - 3) ",secondary," fileSystem "," devBase 
 		}
-	}
-	' )
+	}' )
+	
 	# now add the swap partition data, don't want to show swap files, just partitions,
 	# though this can include /dev/ramzswap0. Note: you can also use /proc/swaps for this
 	# data, it's the same exact output as swapon -s
-	$( echo "$swap_data" | gawk '
+	$( echo "$swap_data" | gawk -v bsdType=$BSD_TYPE '
 	BEGIN {
 		swapCounter = 1
+		usedHolder=""
+		sizeHolder=""
 	}
 	/^\/dev/ {
-		size = sprintf( "%.2f", $3*1024/1000**3 )
+		if ( bsdType == "" ) {
+			usedHolder=$4
+			sizeHolder=$3
+		}
+		else {
+			usedHolder=$3
+			sizeHolder=$2
+		}
+		size = sprintf( "%.2f", sizeHolder*1024/1000**3 )
 		devBase = gensub( /^(\/dev\/)(.+)$/, "\\2", 1, $1 )
-		used = sprintf( "%.2f", $4*1024/1000**3 )
-		percentUsed = sprintf( "%.0f", ( $4/$3 )*100 )
-		print "swap-" swapCounter "," size "GB," used "GB," percentUsed "\%,main," "swap," devBase
+		used = sprintf( "%.2f", usedHolder*1024/1000**3 )
+		percentUsed = sprintf( "%.0f", ( usedHolder/sizeHolder )*100 )
+		print "swap-" swapCounter "," size "GB," used "GB," percentUsed "%,main," "swap," devBase
 		swapCounter = ++swapCounter
 	}' ) )
 	IFS="$ORIGINAL_IFS"
-
+	
+	temp_array=${A_PARTITION_DATA[@]}
+	# echo $temp_array
+	log_function_data "1: A_PARTITION_DATA:\n$temp_array"
+	
+	# we'll use this for older systems where no filesystem type is shown in df
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		mount_data="$( mount )"
+	fi
+	# now we'll handle some fringe cases where irregular df -hT output shows /dev/disk/.. instead of 
+	# /dev/h|sdxy type data for column 1, . A_PARTITION_DATA[6]
+	# Here we just search for the uuid/label and then grab the end of the line to get the right dev item.
+	for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
+	do
+		IFS=","
+		a_partition_working=( ${A_PARTITION_DATA[i]} )
+		IFS="$ORIGINAL_IFS"
+		
+		dev_item=${a_partition_working[6]} # reset each loop
+		fs_type=${a_partition_working[5]}
+		# older bsds have df minus -T so can't get fs type easily, try using mount instead
+		if [[ $BSD_TYPE == 'bsd' && -z $fs_type && -n $dev_item ]];then
+			dev_bsd_item=$( sed -e 's/non-dev-//' -e 's|/|\\/|g' <<< "$dev_item" )
+			fs_type=$( gawk -F '(' '
+			/'$dev_bsd_item'/ {
+				# slice out everything after / plus the first comma
+				sub( /,.*/, "", $2 )
+				print $2
+				exit
+			}' <<< "$mount_data" )
+		fi
+		# note: for swap this will already be set
+		if [[ -n $( grep -E '(by-uuid|by-label)' <<< $dev_item ) ]];then
+			dev_working_item=$( basename $dev_item )
+			if [[ -n $DEV_DISK_UUID ]];then
+				dev_item=$( echo "$DEV_DISK_UUID" | gawk '
+					$0 ~ /[ /t]'$dev_working_item'[ /t]/ {
+						item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+						print item
+						exit
+					}' )
+			fi
+			# if we didn't find anything for uuid try label
+			if [[ -z $dev_item && -n $DEV_DISK_LABEL ]];then
+				dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
+					$0 ~ /[ /t]'$dev_working_item'[ /t]/ {
+						item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+						print item
+						exit
+					}' )
+			fi
+		elif [[ -n $( grep 'mapper/' <<< $dev_item ) ]];then
+			# get the mapper actual dev item
+			dev_item=$( get_dev_processed_item "$dev_item" )
+		fi
+		
+		if [[ -n $dev_item ]];then
+			# assemble everything we could get for dev/h/dx, label, and uuid
+			IFS=","
+			A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","$fs_type","$dev_item
+			IFS="$ORIGINAL_IFS"
+		fi
+	done
+	temp_array=${A_PARTITION_DATA[@]}
+	# echo $temp_array
+	log_function_data "2: A_PARTITION_DATA:\n$temp_array"
 	if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
 		get_partition_data_advanced
 	fi
-	log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
 	eval $LOGFE
 }
 
@@ -3086,16 +6793,12 @@ get_partition_data_advanced()
 {
 	eval $LOGFS
 	local a_partition_working='' dev_partition_data=''
-	local dev_disk_label='' dev_disk_uuid='' dev_item='' dev_label='' dev_uuid=''
+	local dev_item='' dev_label='' dev_uuid='' temp_array=''
 	local mount_point=''
-
-	if [[ -d /dev/disk/by-label ]];then
-		dev_disk_label="$( ls -l /dev/disk/by-label )"
-	fi
-	if [[ -d /dev/disk/by-uuid ]];then
-		dev_disk_uuid="$( ls -l /dev/disk/by-uuid )"
-	fi
-	log_function_data 'raw' "dev_disk_label:\n$dev_disk_label\n\ndev_disk_uuid:\n$dev_disk_uuid"
+	# set dev disk label/mapper/uuid data globals
+	get_partition_dev_data 'label'
+	get_partition_dev_data 'mapper'
+	get_partition_dev_data 'uuid'
 
 	if [[ $B_MOUNTS_FILE == 'true' ]];then
 		for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
@@ -3106,6 +6809,7 @@ get_partition_data_advanced()
 			
 			# note: for swap this will already be set
 			if [[ -z ${a_partition_working[6]} ]];then
+				
 				mount_point=$( sed 's|/|\\/|g'  <<< ${a_partition_working[0]} )
 				#echo mount_point $mount_point
 				dev_partition_data=$( gawk '
@@ -3138,7 +6842,7 @@ get_partition_data_advanced()
 						# if this works, great, otherwise, just set this to null values
 						partTemp="'$( readlink /dev/root 2>/dev/null )'"
 						if ( partTemp != "" ) {
-							if ( partTemp ~ /[hs]d[a-z][0-9]/ ) {
+							if ( partTemp ~ /[hsv]d[a-z][0-9]{1,2}/ ) {
 								partition=gensub( /^(\/dev\/)(.+)$/, "\\2", 1, partTemp )
 							}
 							else if ( partTemp ~ /by-uuid/ ) {
@@ -3157,6 +6861,7 @@ get_partition_data_advanced()
 						}
 					}
 					print partition "," label "," uuid
+					exit
 				}'	$FILE_MOUNTS )
 
 				# assemble everything we could get for dev/h/dx, label, and uuid
@@ -3168,42 +6873,55 @@ get_partition_data_advanced()
 			IFS=","
 			a_partition_working=( ${A_PARTITION_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
-
-			dev_item=${a_partition_working[6]}
+			# get the mapper actual dev item first, in case it's mapped
+			dev_item=$( get_dev_processed_item "${a_partition_working[6]}" )
+			# make sure not to slice off rest if it's a network mounted file system
+			if [[ -n $dev_item && -z $( grep -E '(^//|:/)' <<< $dev_item ) ]];then
+				dev_item=$( basename $dev_item ) ## needed to avoid error in case name still has / in it
+			fi
 			dev_label=${a_partition_working[7]}
 			dev_uuid=${a_partition_working[8]}
-			
 			# then if dev data/uuid is incomplete, try to get missing piece
 			# it's more likely we'll get a uuid than a label. But this should get the
 			# dev item set no matter what, so then we can get the rest of any missing data
 			# first we'll get the dev_item if it's missing
-			if [[ -n $dev_disk_uuid ]] && [[ -z $dev_item && -n $dev_uuid ]];then
-				dev_item=$( echo "$dev_disk_uuid" | gawk '
-					/'$dev_uuid'/ {
-						item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
-						print item
+			if [[ -z $dev_item ]];then
+				if [[ -n $DEV_DISK_UUID && -n $dev_uuid ]];then
+					dev_item=$( echo "$DEV_DISK_UUID" | gawk '
+						$0 ~ /[ \t]'$dev_uuid'[ \t]/ {
+							item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+							print item
+							exit
+						}' )
+				elif [[ -n $DEV_DISK_LABEL && -n $dev_label ]];then
+					dev_item=$( echo "$DEV_DISK_LABEL" | gawk '
+						# first we need to change space x20 in by-label back to a real space
+						#gsub( /x20/, " ", $0 )
+						# then we can see if the string is there
+						$0 ~ /[ \t]'$dev_label'[ \t]/ {
+							item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
+							print item
+							exit
+						}' )
+				fi
+			fi
+			
+			# this can trigger all kinds of weird errors if it is a non /dev path, like: remote:/machine/name
+			if [[ -n $dev_item && -z $( grep -E '(^//|:/)' <<< $dev_item ) ]];then
+				if [[ -n $DEV_DISK_UUID && -z $dev_uuid ]];then
+					dev_uuid=$( echo "$DEV_DISK_UUID" | gawk  '
+					/'$dev_item'$/ {
+						print $(NF - 2)
+						exit
 					}' )
-			elif [[ -n $dev_disk_label ]] && [[ -z $dev_item && -n $dev_label ]];then
-				dev_item=$( echo "$dev_disk_label" | gawk '
-					# first we need to change space x20 in by-label back to a real space
-					#gsub( /x20/, " ", $0 )
-					# then we can see if the string is there
-					/'$dev_label'/ {
-						item=gensub( /..\/..\/(.+)/, "\\1", 1, $NF )
-						print item
+				fi
+				if [[ -n $DEV_DISK_LABEL && -z $dev_label ]];then
+					dev_label=$( echo "$DEV_DISK_LABEL" | gawk '
+					/'$dev_item'$/ {
+						print $(NF - 2)
+						exit
 					}' )
-			fi
-			if [[ -n $dev_disk_uuid ]] && [[ -n $dev_item && -z $dev_uuid ]];then
-				dev_uuid=$( echo "$dev_disk_uuid" | gawk '
-				/'$dev_item'$/ {
-					print $(NF - 2)
-				}' )
-			fi
-			if [[ -n $dev_disk_label ]] && [[ -n $dev_item && -z $dev_label ]];then
-				dev_label=$( echo "$dev_disk_label" | gawk '
-				/'$dev_item'/ {
-					print $(NF - 2)
-				}' )
+				fi
 			fi
 
 			# assemble everything we could get for dev/h/dx, label, and uuid
@@ -3212,27 +6930,357 @@ get_partition_data_advanced()
 			IFS="$ORIGINAL_IFS"
 		done
 		log_function_data 'cat' "$FILE_MOUNTS"
+	else
+		if [[ $BSD_TYPE == 'bsd' ]];then
+			get_partition_data_advanced_bsd
+		fi
+	fi
+	temp_array=${A_PARTITION_DATA[@]}
+	# echo $temp_array
+	log_function_data "3-advanced: A_PARTITION_DATA:\n$temp_array"
+	eval $LOGFE
+}
+
+get_partition_data_advanced_bsd()
+{
+	eval $LOGFS
+	local gpart_data="$( gpart list 2>/dev/null )"
+	local a_partition_working='' label_uuid='' dev_item=''
+	
+	if [[ -n $gpart_data ]];then
+		for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
+		do
+			IFS=","
+			a_partition_working=( ${A_PARTITION_DATA[i]} )
+			IFS="$ORIGINAL_IFS"
+			# no need to use the rest of the name if it's not a straight /dev/item
+			dev_item=$( basename ${a_partition_working[6]} )
+			
+			label_uuid=$( gawk -F ':' '
+			BEGIN {
+				IGNORECASE=1
+				label=""
+				uuid=""
+			}
+			/^[0-9]+\.[[:space:]]*Name.*'$dev_item'/ {
+				while ( getline && $1 !~ /^[0-9]+\.[[:space:]]*Name/ ) {
+					if ( $1 ~ /rawuuid/ ) {
+						gsub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
+						uuid=$2
+					}
+					if ( $1 ~ /label/ ) {
+						gsub(/^[[:space:]]+|[[:space:]]+$|none|\(null\)/,"",$2)
+						label=$2
+					}
+				}
+				print label","uuid
+				exit
+			}' <<< "$gpart_data" )
+
+			# assemble everything we could get for dev/h/dx, label, and uuid
+			IFS=","
+			A_PARTITION_DATA[i]=${a_partition_working[0]}","${a_partition_working[1]}","${a_partition_working[2]}","${a_partition_working[3]}","${a_partition_working[4]}","${a_partition_working[5]}","${a_partition_working[6]}","$label_uuid
+			IFS="$ORIGINAL_IFS"
+		done
+	fi
+	eval $LOGFE
+}
+
+# args: $1 - uuid/label/id/mapper
+get_partition_dev_data()
+{
+	eval $LOGFS
+	
+	# only run these tests once per directory to avoid excessive queries to fs
+	case $1 in
+		id)
+			if [[ $B_ID_SET != 'true' ]];then
+				if [[ -d /dev/disk/by-id ]];then
+					DEV_DISK_ID="$( ls -l /dev/disk/by-id )"
+				fi
+				B_ID_SET='true'
+			fi
+			;;
+		label)
+			if [[ $B_LABEL_SET != 'true' ]];then
+				if [[ -d /dev/disk/by-label ]];then
+					DEV_DISK_LABEL="$( ls -l /dev/disk/by-label )"
+				fi
+				B_LABEL_SET='true'
+			fi
+			;;
+		mapper)
+			if [[ $B_MAPPER_SET != 'true' ]];then
+				if [[ -d /dev/mapper ]];then
+					DEV_DISK_MAPPER="$( ls -l /dev/mapper )"
+				fi
+				B_MAPPER_SET='true'
+			fi
+			;;
+		uuid)
+			if [[ $B_UUID_SET != 'true' ]];then
+				if [[ -d /dev/disk/by-uuid ]];then
+					DEV_DISK_UUID="$( ls -l /dev/disk/by-uuid )"
+				fi
+				B_UUID_SET='true'
+			fi
+			;;
+		
+	esac
+	log_function_data 'raw' "DEV_DISK_LABEL:\n$DEV_DISK_LABEL\n\nDEV_DISK_UUID:\n$DEV_DISK_UUID\n\nDEV_DISK_ID:\n$DEV_DISK_ID\n\nDEV_DISK_MAPPER:\n$DEV_DISK_MAPPER"
+	# debugging section, uncomment to insert user data
+# 	DEV_DISK_LABEL='
+#
+# '
+# DEV_DISK_UUID='
+#
+# '
+# DEV_DISK_MAPPER='
+#
+# '
+	eval $LOGFE
+}
+
+# args: $1 - dev item, check for mapper, then get actual dev item if mapped
+# eg: lrwxrwxrwx 1 root root       7 Sep 26 15:10 truecrypt1 -> ../dm-2 
+get_dev_processed_item()
+{
+	eval $LOGFS
+	
+	local dev_item=$1 dev_return=''
+	
+	if [[ -n $DEV_DISK_MAPPER && -n $( grep -is 'mapper/' <<< $dev_item ) ]];then
+		dev_return=$( echo "$DEV_DISK_MAPPER" | gawk '
+		$( NF - 2 ) ~ /^'$( basename $dev_item )'$/ {
+			item=gensub( /..\/(.+)/, "\\1", 1, $NF )
+			print item
+		}' )
+	fi
+	if [[ -z $dev_return ]];then
+		dev_return=$dev_item
 	fi
-	log_function_data "A_PARTITION_DATA: ${A_PARTITION_DATA[@]}"
+	
+	echo $dev_return
+
+	eval $LOGFE
+}
+
+get_patch_version_string()
+{
+	local patch_version_number=$( sed 's/^[0]*//' <<< $SCRIPT_PATCH_NUMBER )
+	
+	if [[ -n $patch_version_number ]];then
+		patch_version_number="-$patch_version_number"
+		# for cases where it was for example: 00-bsd cleaned to --bsd trim out one -
+		if [[ -n $( grep '\--' <<< $patch_version_number ) ]];then
+			patch_version_number=$( sed 's/--/-/' <<< $patch_version_number )
+		fi
+	fi
+	echo $patch_version_number
+}
+
+get_pciconf_data()
+{
+	eval $LOGFS
+	
+	local pciconf_data='' temp_array=''
+	
+	if [[ $B_PCICONF == 'true' ]];then
+		pciconf_data="$( pciconf -lv 2>/dev/null )"
+		if [[ -n $pciconf_data ]];then
+			pciconf_data=$( gawk '
+			BEGIN {
+				IGNORECASE=1
+			}
+			{
+					gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
+					gsub(/[[:space:]]+=[[:space:]]+/, "=",$0)
+					gsub(/^[[:space:]]+|'"'"'|\"|,/, "", $0)
+					gsub(/=0x/,"=",$0)
+					# line=gensub(/.*[[:space:]]+(class=[^[:space:]]*|card=[^[:space:]]*)|chip=[^[:space:]]*|rev=[^[:space:]]*|hdr=[^[:space:]]*).*/,"\n\\1","g",$0)
+					line=gensub(/(.*@.*)/,"\n\\1",$0)
+					print line
+			}' <<< "$pciconf_data" )
+			# create empty last line with this spacing trick
+			pciconf_data="$pciconf_data
+
+EOF"
+			# echo "$pciconf_data"
+			# now insert into arrays
+			IFS=$'\n'
+			A_PCICONF_DATA=( $( gawk '
+			BEGIN {
+				fullLine=""
+				driver=""
+				vendor=""
+				device=""
+				class=""
+				chipId=""
+				pciId=""
+				itemData=""
+				IGNORECASE=1
+			}
+			/^.*@/ {
+				pciId=""
+				vendor=""
+				class=""
+				driver=""
+				device=""
+				chipId=""
+				itemData=$1
+				
+				driver=gensub(/^([^@]+)@.*/, "\\1", itemData )
+				pciId=gensub(/^.*@pci([0-9\.:]+).*/, "\\1", itemData )
+				sub(/:$/, "", pciId)
+				itemData=$4
+				chipId=gensub(/.*chip=([0-9a-f][0-9a-f][0-9a-f][0-9a-f])([0-9a-f][0-9a-f][0-9a-f][0-9a-f]).*/, "\\2:\\1", itemData )
+				if ( $2 == "class=020000" ) {
+					class="network"
+				}
+				else if ( $2 == "class=030000" ) {
+					class="display"
+				}
+				else if ( $2 == "class=040300" ) {
+					class="audio"
+				}
+				
+				while ( getline && $1 !~ /^$/ ) {
+					if ( $1 ~ /^vendor/ ) {
+						sub(/^vendor=/, "", $1 )
+						vendor=$0
+					}
+					else if ( $1 ~ /^device/ ) {
+						sub(/^device=/, "", $1 )
+						device=$0
+					}
+					else if ( $1 ~ /^class=/ && class == "" ) {
+						sub(/^class=/, "", $1)
+						class=$0
+					}
+				}
+				if ( device == "" ) {
+					device=vendor
+				}
+				
+				fullLine=class "," device "," vendor "," driver "," pciId "," chipId
+				print fullLine
+			
+			}' <<< "$pciconf_data" ))
+			IFS="$ORIGINAL_IFS"
+		fi
+	else
+		A_PCICONF_DATA='pciconf-not-installed'
+	fi
+	B_PCICONF_SET='true'
+	temp_array=${A_PCICONF_DATA[@]}
+	log_function_data "$temp_array"
+	log_function_data "$pciconf_data"
+	eval $LOGFE
+}
+
+# packs standard card arrays using the pciconf stuff
+# args: $1 - audio/network/display - matches first item in A_PCICONF_DATA arrays
+get_pciconf_card_data()
+{
+	eval $LOGFS
+	local a_temp='' array_string='' j=0 device_string=''
+	local ip_tool_command=$( type -p ifconfig )
+	local mac='' state='' speed='' duplex='' network_string=''
+	
+	for (( i=0;i<${#A_PCICONF_DATA[@]};i++ ))
+	do
+		IFS=','
+		a_temp=( ${A_PCICONF_DATA[i]} )
+		IFS="$ORIGINAL_IFS"
+		
+		if [[ ${a_temp[0]} == $1 ]];then
+			# don't print the vendor if it's already in the device name
+			if [[ -z $( grep -i "${a_temp[2]}" <<< "${a_temp[1]}" ) ]];then
+				device_string="${a_temp[2]} ${a_temp[1]}"
+			else
+				device_string=${a_temp[1]}
+			fi
+			case $1 in
+				audio)
+					array_string="$device_string,${a_temp[3]},,,${a_temp[4]},,${a_temp[5]}"
+					A_AUDIO_DATA[j]=$array_string
+					;;
+				display)
+					array_string="$device_string,${a_temp[4]},${a_temp[5]}"
+					A_GRAPHICS_CARD_DATA[j]=$array_string
+					;;
+				network)
+					if [[ -n $ip_tool_command && -n ${a_temp[3]} ]];then
+						network_string=$( 	$ip_tool_command ${a_temp[3]} | gawk '
+						BEGIN {
+							IGNORECASE=1
+							mac=""
+							state=""
+							speed=""
+							duplex=""
+						}
+						/^[[:space:]]*ether/ {
+							mac = $2
+						}
+						/^[[:space:]]*media/ {
+							if ( $0 ~ /<.*>/ ) {
+								duplex=gensub(/.*<([^>]+)>.*/,"\\1",$0)
+							}
+							if ( $0 ~ /\(.*\)/ ) {
+								speed=gensub(/.*\(([^<[:space:]]+).*\).*/,"\\1",$0)
+							}
+						}
+						/^[[:space:]]*status/ {
+							sub(/.*status[:]?[[:space:]]*/,"", $0)
+							state=$0
+						}
+						END {
+							print state "~" speed "~" mac "~" duplex
+						}')
+					fi
+					if [[ -n $network_string ]];then
+						mac=$( cut -d '~' -f 3 <<< $network_string )
+						state=$( cut -d '~' -f 1 <<< $network_string )
+						speed=$( cut -d '~' -f 2 <<< $network_string )
+						duplex=$( cut -d '~' -f 4 <<< $network_string )
+					fi
+					array_string="$device_string,${a_temp[3]},,,${a_temp[4]},${a_temp[3]},$state,$speed,$duplex,$mac,${a_temp[5]}"
+					A_NETWORK_DATA[j]=$array_string
+					;;
+			esac
+			((j++))
+		fi
+	done
+	
 	eval $LOGFE
 }
 
 # args: $1 - type cpu/mem 
-get_ps_data()
+get_ps_tcm_data()
 {
 	eval $LOGFS
-	local array_length='' reorder_temp='' i=0 head_tail='' sort_type=''
+	local array_length='' reorder_temp='' i=0 head_tail='' sort_type='' ps_data=''
 	
 	# bummer, have to make it more complex here because of reverse sort
 	# orders in output, pesky lack of support of +rss in old systems
 	case $1 in
 		mem)
-			head_tail='head'
-			sort_type='-rss'
+			if [[ $BSD_TYPE != 'bsd' ]];then
+				sort_type='ps aux --sort -rss'
+				head_tail='head'
+			else
+				sort_type='ps aux -m'
+				head_tail='head'
+			fi
 			;;
 		cpu)
-			head_tail='tail'
-			sort_type='%cpu'
+			if [[ $BSD_TYPE != 'bsd' ]];then
+				sort_type='ps aux --sort %cpu'
+				head_tail='tail'
+			else
+				sort_type='ps aux -r'
+				head_tail='head'
+			fi
 			;;
 	esac
 	
@@ -3241,10 +7289,12 @@ get_ps_data()
 		PS_THROTTLED=$PS_COUNT
 		PS_COUNT=5
 	fi
+	# use eval here to avoid glitches with -
+	ps_data="$( eval $sort_type )"
 
 	IFS=$'\n'
 	# note that inxi can use a lot of cpu, and can actually show up here as the script runs
-	A_PS_DATA=( $( ps aux --sort $sort_type | grep -Ev "($SCRIPT_NAME|%CPU|[[:space:]]ps[[:space:]])" | $head_tail -n $PS_COUNT | gawk '
+	A_PS_DATA=( $( echo "$ps_data" | grep -Ev "($SCRIPT_NAME|%CPU|[[:space:]]ps[[:space:]])" | $head_tail -n $PS_COUNT | gawk '
 	BEGIN {
 		IGNORECASE=1
 		appName=""
@@ -3281,7 +7331,7 @@ get_ps_data()
 	# make the array ordered highest to lowest so output looks the way we expect it to
 	# this isn't necessary for -rss, and we can't make %cpu ordered the other way, so
 	# need to reverse it here. -rss is used because on older systems +rss is not supported
-	if [[ $1 == 'cpu' ]];then
+	if [[ $1 == 'cpu' && $BSD_TYPE != 'bsd' ]];then
 		array_length=${#A_PS_DATA[@]}; 
 		while (( $i < $array_length/2 ))
 		do 
@@ -3298,97 +7348,449 @@ get_ps_data()
 	eval $LOGFE
 }
 
+# mdstat syntax information: http://www-01.ibm.com/support/docview.wss?uid=isg3T1011259
+# note that this does NOT use either Disk or Partition information for now, ie, there
+# is no connection between the data types, but the output should still be consistent
+get_raid_data()
+{
+	eval $LOGFS
+	
+	local mdstat=''
+		
+	if [[ $B_MDSTAT_FILE == 'true' ]];then
+	 	mdstat="$( cat $FILE_MDSTAT 2>/dev/null )"
+	fi
+	
+	if [[ -n $mdstat ]];then
+		# need to make sure there's always a newline in front of each record type, and
+		# also correct possible weird formats for the output from older kernels etc.
+		mdstat="$( sed -e 's/^md/\nmd/' -e 's/^unused[[:space:]]/\nunused /' \
+		-e 's/read_ahead/\nread_ahead/' -e 's/^resync=/\nresync=/' -e 's/^Event/\nEvent/' \
+		-e 's/^[[:space:]]*$//' -e 's/[[:space:]]read_ahead/\nread_ahead/' <<< "$mdstat" )"
+		# some fringe cases do not end as expected, so need to add newlines plus EOF to make sure while loop doesn't spin
+		mdstat=$( echo -e "$mdstat\n\nEOF" )
+
+		IFS=$'\n'
+		A_RAID_DATA=( $(
+		gawk '
+		BEGIN {
+			IGNORECASE=1
+			RS="\n"
+		}
+		
+		/^personalities/ {
+			KernelRaidSupport = gensub(/personalities[[:space:]]*:[[:space:]]*(.*)/, "\\1", 1, $0)
+			# clean off the brackets
+			gsub(/[\[\]]/,"",KernelRaidSupport)
+			print "KernelRaidSupport," KernelRaidSupport
+		}
+		/^read_ahead/ {
+			ReadAhead=gensub(/read_ahead (.*)/, "\\1", 1 )
+			print "ReadAhead," ReadAhead
+		}
+		/^Event:/ {
+			print "raidEvent," $NF
+		}
+		# print logic will search for this value and use it to print out the unused devices data
+		/^unused devices/ {
+			unusedDevices = gensub(/^unused devices:[[:space:]][<]?([^>]*)[>]?.*/, "\\1", 1, $0)
+			print "UnusedDevices," unusedDevices
+		}
+		
+		/^md/ {
+			# reset for each record loop through
+			deviceState = ""
+			bitmapValues = ""
+			blocks = ""
+			chunkSize = ""
+			components = ""
+			device = ""
+			deviceReport = ""
+			finishTime = ""
+			recoverSpeed = ""
+			recoveryProgressBar = ""
+			recoveryPercent = ""
+			raidLevel = ""
+			sectorsRecovered = ""
+			separator = ""
+			superBlock = ""
+			uData = ""
+			
+			while ( !/^[[:space:]]*$/  ) {
+				gsub(/,/, " ", $0 )
+				gsub(/[[:space:]]+/, " ", $0 )
+				if ( $0 ~ /^md/ ) {
+					device = gensub(/(md.*)[[:space:]]?:/, "\\1", "1", $1 )
+				}
+				if ( $0 ~ /mirror|raid[0-9]+/ ) {
+					raidLevel = gensub(/(.*)raid([0-9]+)(.*)/, "\\2", "g", $0 )
+				}
+				if ( $0 ~ /(active \(auto-read-only\)|active|inactive)/ ) {
+					deviceState = gensub(/(.*) (active \(auto-read-only\)|active|inactive) (.*)/, "\\2", "1", $0 )
+				}
+				# gawk will not return all the components using gensub, only last one
+				separator = ""
+				for ( i=3; i<=NF; i++ ) {
+					if ( $i ~ /[hs]d[a-z][0-9]*(\[[0-9]+\])?(\([SF]\))?/ ) {
+						components = components separator $i
+						separator=" "
+					}
+				}
+				if ( $0 ~ /blocks/ ) {
+					blocks = gensub(/(.*[[:space:]]+)?([0-9]+)[[:space:]]blocks.*/, "\\2", "1", $0)
+				}
+				if ( $0 ~ /super[[:space:]][0-9\.]+/ ) {
+					superBlock = gensub(/.*[[:space:]]super[[:space:]]([0-9\.]+)[[:space:]].*/, "\\1", "1", $0)
+				}
+				if ( $0 ~ /algorithm[[:space:]][0-9\.]+/ ) {
+					algorithm = gensub(/.*[[:space:]]algorithm[[:space:]]([0-9\.]+)[[:space:]].*/, "\\1", "1", $0)
+				}
+				if ( $0 ~ /\[[0-9]+\/[0-9]+\]/ ) {
+					deviceReport = gensub(/.*[[:space:]]\[([0-9]+\/[0-9]+)\][[:space:]].*/, "\\1", "1", $0)
+					uData = gensub(/.*[[:space:]]\[([U_]+)\]/, "\\1", "1", $0)
+				}
+				# need to avoid this:  bitmap: 0/10 pages [0KB], 16384KB chunk
+				# while currently all the normal chunks are marked with k, not kb, this can change in the future
+				if ( $0 ~ /[0-9]+[k] chunk/ && $0 !~ /bitmap/ ) {
+					chunkSize = gensub(/(.*) ([0-9]+[k]) chunk.*/, "\\2", "1", $0)
+				}
+				if ( $0 ~ /^resync=/ ) {
+					sub(/resync=/,"")
+					print "resyncStatus," $0
+				}
+				if ( $0 ~ /\[[=]*>[\.]*\].*(resync|recovery)/ ) {
+					recoveryProgressBar = gensub(/.*(\[[=]*>[\.]*\]).*/, "\\1",1,$0)
+				}
+				if ( $0 ~ / (resync|recovery)[[:space:]]*=/ ) {
+					recoveryPercent = gensub(/.* (resync|recovery)[[:space:]]*=[[:space:]]*([0-9\.]+%).*/, "\\1~\\2", 1 )
+					if ( $0 ~ /[[:space:]]\([0-9]+\/[0-9]+\)/ ) {
+						sectorsRecovered = gensub(/.* \(([0-9]+\/[0-9]+)\).*/, "\\1", 1, $0 )
+					}
+					if ( $0 ~ /finish[[:space:]]*=/ ) {
+						finishTime = gensub(/.* finish[[:space:]]*=[[:space:]]*([[0-9\.]+)([a-z]+) .*/, "\\1 \\2", 1, $0 )
+					}
+					if ( $0 ~ /speed[[:space:]]*=/ ) {
+						recoverSpeed = gensub(/.* speed[[:space:]]*=[[:space:]]*([[0-9\.]+)([a-z]+\/[a-z]+)/, "\\1 \\2", 1, $0 )
+					}
+				}
+				if ( $0 ~ /bitmap/ ) {
+					bitmapValues = gensub(/(.*[[:space:]])?bitmap:(.*)/, "\\2", 1, $0 )
+				}
+				
+				getline
+			}
+			raidString = device "," deviceState "," raidLevel "," components "," deviceReport "," uData 
+			raidString = raidString "," blocks "," superBlock "," algorithm "," chunkSize "," bitmapValues
+			raidString = raidString "," recoveryProgressBar "," recoveryPercent "," sectorsRecovered "," finishTime "," recoverSpeed
+			
+			print raidString
+		}
+		' <<< "$mdstat" ) )
+		IFS="$ORIGINAL_IFS"
+	else
+		if [[ $BSD_TYPE == 'bsd' ]];then
+			get_raid_data_bsd
+		fi
+	fi
+	B_RAID_SET='true'
+	temp_array=${A_RAID_DATA[@]}
+	log_function_data "A_RAID_DATA: $temp_array"
+# 	echo -e "A_RAID_DATA:\n${temp_array}"
+	
+	eval $LOGFE
+}
+
+get_raid_data_bsd()
+{
+	eval $LOGFS
+	local zpool_path=$( type -p zpool 2>/dev/null )
+	local zpool_data=''
+	
+	if [[ -n $zpool_path ]];then
+		B_BSD_RAID='true'
+		# bsd sed does not support inserting a true \n so use this trick
+		zpool_data="$( $zpool_path list -v | sed $SED_RX 's/^([^[:space:]])/\
+\1/' )"
+# 		echo "$zpool_data"
+		IFS=$'\n'
+		A_RAID_DATA=( $(
+		gawk '
+		BEGIN {
+			raidString=""
+			separator=""
+			components=""
+			reportSize=""
+			blocksAvailable=""
+			chunkRaidAllocated=""
+		}
+		/SIZE.*ALLOC/ {
+			sub(/.*ALLOC.*/,"", $0)
+		}
+		/^[^[:space:]]/ {
+			components=""
+			separator=""
+			raidLevel=""
+			device=$1
+			deviceState=$7
+			reportSize=$2
+			blocksAvailable=$4
+			chunkRaidAllocated=$3
+			
+			# go to the next line now, this will probably need fixing later with weird data sets
+			getline
+			if ( $1 != "" ) {
+				raidLevel="zfs " $1
+			}
+			
+			while ( getline && $1 !~ /^$/ ) {
+				# print $1
+				components = components separator $1
+				separator=" "
+			}
+
+			# print $1
+			raidString = device "," deviceState "," raidLevel "," components "," reportSize "," uData 
+			raidString = raidString "," blocksAvailable "," superBlock "," algorithm "," chunkRaidAllocated 
+			# none of these are used currently
+			raidString = raidString "," bitmapValues  "," recoveryProgressBar "," recoveryPercent 
+			raidString = raidString "," sectorsRecovered "," finishTime "," recoverSpeed
+			gsub(/~/,"",raidString)
+			print raidString
+		}' <<< "$zpool_data" ) )
+		IFS="$ORIGINAL_IFS"
+		get_raid_component_data_bsd
+	fi
+	eval $LOGFE
+}
+
+# note, we've already tested for zpool so no further tests required
+get_raid_component_data_bsd()
+{
+	eval $LOGFS
+	local a_raid_data='' array_string='' component='' component_string='' 
+	local zpool_status='' device='' separator='' component_status=''
+	
+	for (( i=0; i<${#A_RAID_DATA[@]}; i++))
+	do
+		IFS=","
+		a_raid_data=( ${A_RAID_DATA[i]} )
+		IFS="$ORIGINAL_IFS"
+		separator=''
+		component_string=''
+		component_status=''
+		zpool_status=''
+		device=${a_raid_data[0]}
+		zpool_status="$( zpool status $device )"
+		# we will remove ONLINE for status and only use OFFLINE/DEGRADED as tests
+		# for print output display of issues with components
+		for component in ${a_raid_data[3]}
+		do
+			component_status=$( gawk '
+			BEGIN {
+				IGNORECASE=1
+			}
+			$1 ~ /^'$component'$/ {
+				sub( /ONLINE/, "", $2 )
+				print "'$component'" $2
+				exit
+			}' <<< "$zpool_status" )
+			component_string="$component_string$separator$component_status"
+			separator=' '
+		done
+		array_string="$device,${a_raid_data[1]},${a_raid_data[2]},$component_string,${a_raid_data[4]}"
+		array_string="$array_string,${a_raid_data[5]},${a_raid_data[6]},${a_raid_data[7]},${a_raid_data[8]}"
+		array_string="$array_string,${a_raid_data[9]},${a_raid_data[10]},${a_raid_data[11]},${a_raid_data[12]},"
+		array_string="$array_string${a_raid_data[13]},${a_raid_data[14]},${a_raid_data[15]}"
+		IFS=","
+		A_RAID_DATA[i]=$array_string
+		IFS="$ORIGINAL_IFS"
+	done
+	
+	eval $LOGFE
+}
+# get_raid_data_bsd;exit
+
 # Repos will be added as we get distro package manager data to create the repo data. 
 # This method will output the file name also, which is useful to create output that's 
-# neat and readable.
+# neat and readable. Each line of the total number contains the following sections,
+# separated by a : for splitting in the print function
+# part one, repo type/string : part two, file name, if present, of info : part 3, repo data
 get_repo_data()
 {
 	eval $LOGFS
-	local repo_file='' repo_data_working='' repo_data_working2='' repo_line=''
+	local repo_file='' repo_data_working='' repo_data_working2='' repo_line='' repo_files=''
+	local repo_name=''
 	local apt_file='/etc/apt/sources.list' yum_repo_dir='/etc/yum.repos.d/' yum_conf='/etc/yum.conf'
 	local pacman_conf='/etc/pacman.conf' pacman_repo_dir='/etc/pacman.d/' pisi_dir='/etc/pisi/'
+	local zypp_repo_dir='/etc/zypp/repos.d/' freebsd_conf='/etc/portsnap.conf'
 	
-	# apt - debian, buntus
+	# apt - debian, buntus, also sometimes some yum/rpm repos may create apt repos here as well
 	if [[ -f $apt_file || -d $apt_file.d ]];then
-		REPO_DATA="$( grep -Esv '(^[[:space:]]*$|^[[:space:]]*#)' $apt_file $apt_file.d/*.list )"
-		REPO_FILE_ID='apt sources'
-	# yum - fedora, redhat, centos, etc
-	elif [[ -d $yum_repo_dir || -f $yum_conf ]];then
-		# older redhats put their yum data in /etc/yum.conf
-		for repo_file in $( ls $yum_repo_dir*.repo $yum_conf 2>/dev/null )
-		do
-			repo_data_working="$( gawk -v repoFile=$repo_file '
-			# construct the string for the print function to work with, file name: data
-			function print_line( fileName, repoId, repoUrl ){
-				print fileName ":" repoId repoUrl
-			}
-			BEGIN {
-				FS="\n"
-				IGNORECASE=1
-				enabledStatus=""
-				repoTitle=""
-				urlData=""
-			}
-			# this is a hack, assuming that each item has these fields listed, we collect the 3
-			# items one by one, then when the url/enabled fields are set, we print it out and
-			# reset the data. Not elegant but it works. Note that if enabled was not present
-			# we assume it is enabled then, and print the line, reset the variables. This will
-			# miss the last item, so it is printed if found in END
-			/^\[.+\]/ {
-				if ( urlData != "" && repoTitle != "" ){
-					print_line( repoFile, repoTitle, urlData )
+		REPO_DATA="$( grep -Esv '(^[[:space:]]*$|^[[:space:]]*#)' $apt_file $apt_file.d/*.list | sed $SED_RX 's/^(.*)/apt sources:\1/' )"
+	fi
+	# yum - fedora, redhat, centos, etc. Note that rpmforge also may create apt sources
+	# in /etc/apt/sources.list.d/. Therefore rather than trying to assume what package manager is
+	# actually running, inxi will merely note the existence of each repo type for apt/yum. 
+	# Also, in rpm, you can install apt-rpm for the apt-get command, so it's not good to check for
+	# only the commands in terms of selecting which repos to show.
+	if [[ -d $yum_repo_dir || -f $yum_conf || -d $zypp_repo_dir ]];then
+		if [[ -d $yum_repo_dir || -f $yum_conf ]];then
+			# older redhats put their yum data in /etc/yum.conf
+			repo_files=$( ls $yum_repo_dir*.repo $yum_conf 2>/dev/null )
+			repo_name='yum'
+		elif [[ -d $zypp_repo_dir ]];then
+			repo_files=$( ls $zypp_repo_dir*.repo 2>/dev/null )
+			repo_name='zypp'
+		fi
+		if [[ -n $repo_files ]];then
+			for repo_file in $repo_files
+			do
+				repo_data_working="$( gawk -v repoFile=$repo_file '
+				# construct the string for the print function to work with, file name: data
+				function print_line( fileName, repoId, repoUrl ){
+					print "'$repo_name' sources:" fileName ":" repoId repoUrl
+				}
+				BEGIN {
+					FS="\n"
+					IGNORECASE=1
 					enabledStatus=""
-					urlData=""
 					repoTitle=""
+					urlData=""
 				}
-				gsub( /\[|\]/, "", $1 ) # strip out the brackets
-				repoTitle = $1 " ~ "
-			}
-			/^(mirrorlist|baseurl)/ {
-				sub( /(mirrorlist|baseurl)=/, "", $1 ) # strip out the field starter
-				urlData = $1
-			}
-			/^enabled=/ {
-				enabledStatus = $1
-			}
-			# print out the line if all 3 values are found, otherwise if a new
-			# repoTitle is hit above, it will print out the line there instead
-			{ 
-				if ( urlData != "" && enabledStatus != "" && repoTitle != "" ){
-					if ( enabledStatus !~ /enabled=0/ ){
+				# this is a hack, assuming that each item has these fields listed, we collect the 3
+				# items one by one, then when the url/enabled fields are set, we print it out and
+				# reset the data. Not elegant but it works. Note that if enabled was not present
+				# we assume it is enabled then, and print the line, reset the variables. This will
+				# miss the last item, so it is printed if found in END
+				/^\[.+\]/ {
+					if ( urlData != "" && repoTitle != "" ){
 						print_line( repoFile, repoTitle, urlData )
+						enabledStatus=""
+						urlData=""
+						repoTitle=""
 					}
-					enabledStatus=""
-					urlData=""
-					repoTitle=""
+					gsub( /\[|\]/, "", $1 ) # strip out the brackets
+					repoTitle = $1 " ~ "
 				}
-			}
-			END {
-				# print the last one if there is data for it
-				if ( urlData != ""  && repoTitle != "" ){
-					print_line( repoFile, repoTitle, urlData )
+				/^(mirrorlist|baseurl)/ {
+					sub( /(mirrorlist|baseurl)[[:space:]]*=[[:space:]]*/, "", $1 ) # strip out the field starter
+					urlData = $1
 				}
-			}
-			' $repo_file )"
-			
-			# then load the global for each file as it gets filled
-			if [[ -n $repo_data_working ]];then
-				if [[ -z $REPO_DATA ]];then
-					REPO_DATA="$repo_data_working"
-				else
-					REPO_DATA="$REPO_DATA
+				# note: enabled = 1. enabled = 0 means disabled
+				/^enabled[[:space:]]*=/ {
+					enabledStatus = $1
+				}
+				# print out the line if all 3 values are found, otherwise if a new
+				# repoTitle is hit above, it will print out the line there instead
+				{ 
+					if ( urlData != "" && enabledStatus != "" && repoTitle != "" ){
+						if ( enabledStatus !~ /enabled[[:space:]]*=[[:space:]]*0/ ){
+							print_line( repoFile, repoTitle, urlData )
+						}
+						enabledStatus=""
+						urlData=""
+						repoTitle=""
+					}
+				}
+				END {
+					# print the last one if there is data for it
+					if ( urlData != ""  && repoTitle != "" ){
+						print_line( repoFile, repoTitle, urlData )
+					}
+				}
+				' $repo_file )"
+				
+				# then load the global for each file as it gets filled
+				if [[ -n $repo_data_working ]];then
+					if [[ -z $REPO_DATA ]];then
+						REPO_DATA="$repo_data_working"
+					else
+						REPO_DATA="$REPO_DATA
 $repo_data_working"
+					fi
+					repo_data_working=''
 				fi
-				repo_data_working=''
+			done
+		fi
+	# pacman - archlinux, going to assume that pisi and arch/pacman, etc don't have the above issue with apt/yum
+	elif [[ -f $pacman_conf ]];then
+		# get list of mirror include files, trim white space off ends
+		repo_data_working="$( gawk '
+		BEGIN {
+			FS="="
+			IGNORECASE=1
+		}
+		/^[[:space:]]*Include/ {
+			sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
+			print $2
+		}
+		' $pacman_conf )"
+		# sort into unique paths only, to be used to search for server = data
+		repo_data_working=$( sort -bu <<< "$repo_data_working" | uniq ) 
+		repo_data_working="$repo_data_working $pacman_conf"
+		for repo_file in $repo_data_working 
+		do
+			if [[ -f $repo_file ]];then
+				# inserting a new line after each found / processed match
+				repo_data_working2="$repo_data_working2$( gawk -v repoFile=$repo_file '
+				BEGIN {
+					FS="="
+					IGNORECASE=1
+				}
+				/^[[:space:]]*Server/ {
+					sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
+					print "pacman repo servers:" repoFile ":" $2 "\\n"
+				}
+				' $repo_file )"
+			else
+				echo "Error: file listed in $pacman_conf does not exist - $repo_file"
 			fi
 		done
-		REPO_FILE_ID='yum repos'
+		# execute line breaks
+		REPO_DATA="$( echo -e $repo_data_working2 )"
 	# pisi - pardus
 	elif [[ -d $pisi_dir && -n $( type -p pisi ) ]];then
 		REPO_DATA="$( pisi list-repo )"
 		# now we need to create the structure: repo info: repo path
 		# we do that by looping through the lines of the output and then
 		# putting it back into the <data>:<url> format print repos expects to see
+		# note this structure in the data, so store first line and make start of line
+		# then when it's an http line, add it, and create the full line collection.
+# Pardus-2009.1 [Aktiv]
+# 	http://packages.pardus.org.tr/pardus-2009.1/pisi-index.xml.bz2
+# Contrib [Aktiv]
+# 	http://packages.pardus.org.tr/contrib-2009/pisi-index.xml.bz2
+		while read repo_line
+		do
+			repo_line=$( gawk '
+			{
+				# need to dump leading/trailing spaces and clear out color codes for irc output
+				sub(/^[[:space:]]+|[[:space:]]+$/,"",$0)
+# 				gsub(/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]/,"",$0) # leaving this pattern in case need it
+				gsub(/\[([0-9];)?[0-9]+m/,"",$0)
+				print $0
+			}' <<< $repo_line )
+			if [[ -n $( grep '://' <<< $repo_line ) ]];then
+				repo_data_working="$repo_data_working:$repo_line\n"
+			else
+				repo_data_working="${repo_data_working}pisi repo:$repo_line"
+			fi
+		done <<< "$REPO_DATA"
+		# echo and execute the line breaks inserted
+		REPO_DATA="$( echo -e $repo_data_working )"
+	# Mandriva/Mageia using: urpmq
+	elif [[ -n $( type -p urpmq ) ]];then
+		REPO_DATA="$( urpmq --list-media active --list-url )"
+		# now we need to create the structure: repo info: repo path
+		# we do that by looping through the lines of the output and then
+		# putting it back into the <data>:<url> format print repos expects to see
+		# note this structure in the data, so store first line and make start of line
+		# then when it's an http line, add it, and create the full line collection.
+# Contrib ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/release
+# Contrib Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/contrib/updates
+# Non-free ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/release
+# Non-free Updates ftp://ftp.uwsg.indiana.edu/linux/mandrake/official/2011/x86_64/media/non-free/updates
+# Nonfree Updates (Local19) /mnt/data/mirrors/mageia/distrib/cauldron/x86_64/media/nonfree/updates
 		while read repo_line
 		do
 			repo_line=$( gawk '
@@ -3399,52 +7801,27 @@ $repo_data_working"
 				gsub(/\[([0-9];)?[0-9]+m/,"",$0)
 				print $0
 			}' <<< $repo_line )
-			if [[ -n $( grep '://' <<< $repo_line ) ]];then
-				repo_data_working="$repo_data_working:$repo_line\n"
-			else
-				repo_data_working="$repo_data_working$repo_line"
+			# urpmq output is the same each line, repo name space repo url, can be:
+			# rsync://, ftp://, file://, http:// OR repo is locally mounted on FS in some cases
+			if [[ -n $( grep -E '(://|[[:space:]]/)' <<< $repo_line ) ]];then
+				# cut out the repo first
+				repo_data_working2=$( grep -Eo '([^[:space:]]+://|[[:space:]]/).*' <<< $repo_line )
+				# then get the repo name string by slicing out the url string
+				repo_name=$( sed "s|[[:space:]]*$repo_data_working2||" <<< $repo_line )
+				repo_data_working="${repo_data_working}urpmq repo:$repo_name:$repo_data_working2\n"
 			fi
 		done <<< "$REPO_DATA"
 		# echo and execute the line breaks inserted
 		REPO_DATA="$( echo -e $repo_data_working )"
-		REPO_FILE_ID='pisi repo'
-	# pacman - archlinux
-	elif [[ -f $pacman_conf ]];then
-		# get list of mirror include files, trim white space off ends
-		repo_data_working="$( gawk '
+	elif [[ -f $freebsd_conf ]];then
+		REPO_DATA="$( gawk -F '=' -v repoFile=$freebsd_conf '
 		BEGIN {
-			FS="="
 			IGNORECASE=1
 		}
-		/^[[:space:]]*Include/ {
-			sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
-			print $2
+		/^SERVERNAME/ {
+			print "BSD ports servers:" repoFile ":" $2
 		}
-		' $pacman_conf )"
-		# sort into unique paths only, to be used to search for server = data
-		repo_data_working=$( sort -bu <<< "$repo_data_working" | uniq ) 
-		repo_data_working="$repo_data_working $pacman_conf"
-		for repo_file in $repo_data_working 
-		do
-			if [[ -f $repo_file ]];then
-				# inserting a new line after each found / processed match
-				repo_data_working2="$repo_data_working2$( gawk -v repoFile=$repo_file '
-				BEGIN {
-					FS="="
-					IGNORECASE=1
-				}
-				/^[[:space:]]*Server/ {
-					sub(/^[[:space:]]+|[[:space:]]+$/,"",$2)
-					print repoFile ":" $2 "\\n"
-				}
-				' $repo_file )"
-			else
-				echo "Error: file listed in $pacman_conf does not exist - $repo_file"
-			fi
-		done
-		# execute line breaks
-		REPO_DATA="$( echo -e $repo_data_working2 )"
-		REPO_FILE_ID='arch repo servers'
+		' $freebsd_conf )"
 	fi
 	eval $LOGFE
 }
@@ -3461,18 +7838,57 @@ get_runlevel_data()
 	eval $LOGFE
 }
 
+# note: it appears that at least as of 2014-01-13, /etc/inittab is going to be used for
+# default runlevel in upstart/sysvinit. systemd default is not always set so check to see 
+# if it's linked.
+get_runlevel_default()
+{
+	eval $LOGFS
+	local default_runlvl=''
+	local inittab='/etc/inittab'
+	local systemd_default='/etc/systemd/system/default.target'
+	local upstart_default='/etc/init/rc-sysinit.conf'
+	
+	# note: systemd systems do not necessarily have this link created
+	if [[ -L $systemd_default  ]];then
+		default_runlvl=$( readlink $systemd_default )
+		if [[ -n $default_runlvl ]];then
+			default_runlvl=$( basename $default_runlvl )
+		fi
+	# 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
+	elif [[ -e $upstart_default ]];then
+		# env DEFAULT_RUNLEVEL=2
+		default_runlvl=$( gawk -F '=' '/^env[[:space:]]+DEFAULT_RUNLEVEL/ {
+		print $2
+		}' $upstart_default )
+	fi
+	
+	# handle weird cases where null but inittab exists
+	if [[ -z $default_runlvl && -f $inittab ]];then
+		default_runlvl=$( gawk -F ':' '
+		/^id.*initdefault/ {
+			print $2
+		}' $inittab )
+	fi
+	echo $default_runlvl
+	eval $LOGFE
+}
+
 get_sensors_data()
 {
 	eval $LOGFS
 	
-	local sensors_path=$( type -p sensors )
+	
+	local temp_array=''
 		
 	IFS=$'\n'
-	if [[ -n $sensors_path ]];then
+	if [[ -n $Sensors_Data ]];then
 		# note: non-configured sensors gives error message, which we need to redirect to stdout
 		# also, -F ':' no space, since some cases have the data starting right after,like - :1287
 		A_SENSORS_DATA=( $( 
-  		$sensors_path | gawk -F ':' -v userCpuNo="$SENSORS_CPU_NO" '
+  		gawk -F ':' -v userCpuNo="$SENSORS_CPU_NO" '
 		BEGIN {
 			IGNORECASE=1
 			core0Temp="" # only if all else fails...
@@ -3495,6 +7911,12 @@ get_sensors_data()
 			tempWorking=""
 			tempWorkingUnit=""
 		}
+		# new data arriving: gpu temp in sensors, have to skip that
+		/^('"$SENSORS_GPU_SEARCH"')-pci/ {
+			while ( getline && !/^$/ ) {
+				# do nothing, just skip it
+			}
+		}
 		# dumping the extra + signs after testing for them,  nobody has negative temps.
 		# also, note gawk treats ° as a space, so we have to get the C/F data
 		# there are some guesses here, but with more sensors samples it will get closer.
@@ -3782,34 +8204,155 @@ get_sensors_data()
 				print fanMainString
 				print fanDefaultString
 			}
-		}
-		'
-		) )
-	# the error case needs to go here because we are setting special array delimiter ','
-	else
-		A_SENSORS_DATA=( "You do not have the sensors app installed." )
+		}' <<< "$Sensors_Data" ) )
 	fi
 	
 	IFS="$ORIGINAL_IFS"
-	log_function_data "A_SENSORS_DATA: ${A_SENSORS_DATA[@]}"
+	temp_array=${A_SENSORS_DATA[@]}
+	log_function_data "A_SENSORS_DATA: $temp_array"
 # 	echo "A_SENSORS_DATA: ${A_SENSORS_DATA[@]}"
 	eval $LOGFE
 }
 
+get_sensors_output()
+{
+	local sensors_path=$( type -p sensors ) sensors_data=''
+	
+	if [[ -n $sensors_path ]];then
+		sensors_data="$( $sensors_path 2>/dev/null )"
+		if [[ -n "$sensors_data" ]];then
+			# make sure the file ends in newlines then characters, the newlines are lost in the echo unless
+			# the data ends in some characters
+			sensors_data="$sensors_data\n\n###" 
+		fi
+	fi
+	echo -e "$sensors_data"
+}
+
+get_shell_data()
+{
+	eval $LOGFS
+
+	local shell_type="$( ps -p $PPID -o comm= 2>/dev/null )"
+	local shell_version='' 
+	
+	if [[ $B_EXTRA_DATA == 'true' && -n $shell_type ]];then
+		case $shell_type in
+			bash)
+				shell_version=$( get_de_app_version "$shell_type" "^GNU[[:space:]]bash,[[:space:]]version" "4" | \
+				sed $SED_RX 's/(\(.*|-release|-version)//' )
+				;;
+			# csh/dash use dpkg package version data, debian/buntu only
+			csh)
+				shell_version=$( get_de_app_version "$shell_type" "^tcsh" "2" )
+				;;
+			dash)
+				shell_version=$( get_de_app_version "$shell_type" "$shell_type" "3" )
+				;;
+			ksh)
+				shell_version=$( get_de_app_version "$shell_type" "version" "5" )
+				;;
+			tcsh)
+				shell_version=$( get_de_app_version "$shell_type" "^tcsh" "2" )
+				;;
+			zsh)
+				shell_version=$( get_de_app_version "$shell_type" "^zsh" "2" )
+				;;
+		esac
+	fi
+	if [[ -n $shell_version ]];then
+		shell_type="$shell_type $shell_version"
+	fi
+	echo $shell_type
+	
+	eval $LOGFS
+}
+
+get_shell_parent()
+{
+	eval $LOGFS
+	local shell_parent='' script_parent='' 
+	
+	# removed --no-headers to make bsd safe, adding in -j to make output the same
+	script_parent=$( ps -j -fp $PPID 2>/dev/null | gawk '/'"$PPID"'/ { print $3 }' )
+	log_function_data "script parent: $script_parent"
+	shell_parent=$( ps -j -p $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $NF}' )
+	# no idea why have to do script_parent action twice in su case, but you do, oh well.
+	if [[ $shell_parent == 'su' ]];then
+		script_parent=$( ps -j -fp $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $3 }' )
+		script_parent=$( ps -j -fp $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $3 }' )
+		shell_parent=$( ps -j -p $script_parent 2>/dev/null | gawk '/'"$script_parent"'/ { print $NF}' )
+	fi
+	echo $shell_parent
+	log_function_data "shell parent final: $shell_parent"
+	eval $LOGFE
+}
+
+# this will be used for some bsd data types
+# args: $1 - option type
+get_sysctl_data()
+{
+	eval $LOGFS
+	
+	local sysctl_data=''
+	
+	if [[ $B_SYSCTL ]];then
+		sysctl_data="$( sysctl -$1 )"
+	fi
+	# log_function_data "sysctl_data: $sysctl_data"
+	echo "$sysctl_data"
+	eval $LOGFE
+}
+
+get_tty_console_irc()
+{
+	eval $LOGFS
+	local tty_number=''
+	if [[ -n ${IRC_CLIENT} ]];then
+		tty_number=$( gawk '
+			BEGIN {
+				IGNORECASE=1
+			}
+			# if multiple irc clients open, can give wrong results
+			# so make sure to also use the PPID number to get the right tty
+			/.*'$PPID'.*'${IRC_CLIENT}'/ {
+				gsub(/[^0-9]/, "", $7)
+				print $7
+				exit
+			}' <<< "$Ps_aux_Data" )
+	fi
+	log_function_data "tty_number: $tty_number"
+	echo $tty_number
+	eval $LOGFE
+}
+
+get_tty_number()
+{
+	eval $LOGFS
+	
+	local tty_number=$( basename "$( tty 2>/dev/null )" | sed 's/[^0-9]*//g' )
+	
+	echo $tty_number
+	
+	eval $LOGFE
+}
+
 get_unmounted_partition_data()
 {
 	eval $LOGFS
-	local a_unmounted_working='' mounted_partitions='' separator='' unmounted_fs=''
-	local dev_disk_label='' dev_disk_uuid='' dev_working='' uuid_working='' label_working=''
+	local a_unmounted_working='' mounted_partitions='' separator='|' unmounted_fs=''
+	local dev_working='' uuid_working='' label_working='' a_raid_working='' raid_partitions=''
 	
 	if [[ $B_PARTITIONS_FILE == 'true' ]];then
-		if [[ -d /dev/disk/by-label ]];then
-			dev_disk_label="$( ls -l /dev/disk/by-label )"
+		# set dev disk label/uuid data globals
+		get_partition_dev_data 'label'
+		get_partition_dev_data 'uuid'
+		# load the raid data array here so we can exclude its partitions
+		if [[ $B_RAID_SET != 'true' ]];then
+			get_raid_data
 		fi
-		if [[ -d /dev/disk/by-uuid ]];then
-			dev_disk_uuid="$( ls -l /dev/disk/by-uuid )"
-		fi
-		
+		# sr0 type cd drives are showing up now as unmounted partitions
+		mounted_partitions="scd[0-9]+|sr[0-9]+|cdrom[0-9]*|cdrw[0-9]*|dvd[0-9]*|dvdrw[0-9]*"
 		# create list for slicing out the mounted partitions
 		for (( i=0; i < ${#A_PARTITION_DATA[@]}; i++ ))
 		do
@@ -3818,31 +8361,43 @@ get_unmounted_partition_data()
 			IFS="$ORIGINAL_IFS"
 			if [[ -n ${a_unmounted_working[6]} ]];then
 				mounted_partitions="$mounted_partitions$separator${a_unmounted_working[6]}"
-				separator='|'
+			fi
+		done
+		# now we need to exclude the mdraid partitions from the unmounted partition output as well
+		for (( i=0; i < ${#A_RAID_DATA[@]}; i++ ))
+		do
+			IFS=","
+			a_raid_working=( ${A_RAID_DATA[i]} )
+			IFS="$ORIGINAL_IFS"
+			if [[ -n ${a_raid_working[3]} ]];then
+				raid_partitions=$( sed $SED_RX 's/(\([^\)]*\)|\[[^\]]*\])//g' <<< ${a_raid_working[3]}\
+				| sed 's/[[:space:]]\+/|/g' )
+				mounted_partitions="$mounted_partitions$separator$raid_partitions"
 			fi
 		done
 	
-		A_UNMOUNTED_PARTITION_DATA=( $( grep -Ev '('$mounted_partitions')' $FILE_PARTITIONS | gawk '
+		A_UNMOUNTED_PARTITION_DATA=( $( grep -Ev '[[:space:]]('$mounted_partitions')$' $FILE_PARTITIONS | gawk '
 		BEGIN {
 			IGNORECASE=1
 		}
 		# note that size 1 means it is a logical extended partition container
 		# lvm might have dm-1 type syntax
-		/[a-z][0-9]+$|dm-[0-9]+$/ && $3 != 1 {
+		# need to exclude loop type file systems, squashfs for example
+		/[a-z][0-9]+$|dm-[0-9]+$/ && $3 != 1 && $NF !~ /loop/ {
 			size = sprintf( "%.2f", $3*1024/1000**3 )
 			print $4 "," size "G"
 		}' ) )
-	
+
 		for (( i=0; i < ${#A_UNMOUNTED_PARTITION_DATA[@]}; i++ ))
 		do
 			IFS=","
 			a_unmounted_working=( ${A_UNMOUNTED_PARTITION_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
 			
-			label_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$dev_disk_label"  | gawk '{
+			label_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$DEV_DISK_LABEL"  | gawk '{
 				print $(NF - 2)
 			}' )
-			uuid_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$dev_disk_uuid"  | gawk '{
+			uuid_working=$( grep -E "${a_unmounted_working[0]}$" <<< "$DEV_DISK_UUID"  | gawk '{
 				print $(NF - 2)
 			}' )
 			unmounted_fs=$( get_unmounted_partition_filesystem "/dev/${a_unmounted_working[0]}" )
@@ -3852,7 +8407,7 @@ get_unmounted_partition_data()
 			IFS="$ORIGINAL_IFS"
 		done
 	fi
-	
+#	echo "${A_PARTITION_DATA[@]}"
 # 	echo "${A_UNMOUNTED_PARTITION_DATA[@]}"
 	eval $LOGFE
 }
@@ -3884,6 +8439,8 @@ get_unmounted_partition_filesystem()
 		fi
 		# 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
+		# BSD fix: -Eio -Em 1
 		partition_filesystem=$( eval $sudo_command $FILE_PATH -s $1 | grep -Eio '(ext2|ext3|ext4|ext5|ext[[:space:]]|ntfs|fat32|fat16|fat[[:space:]]\(.*\)|vfat|fatx|tfat|swap|btrfs|ffs[[:space:]]|hfs\+|hfs[[:space:]]plus|hfs[[:space:]]extended[[:space:]]version[[:space:]][1-9]|hfsj|hfs[[:space:]]|jfs[[:space:]]|nss[[:space:]]|reiserfs|reiser4|ufs2|ufs[[:space:]]|xfs[[:space:]]|zfs[[:space:]])' | grep -Em 1 '.*' )
 		if [[ -n $partition_filesystem ]];then
 			echo $partition_filesystem
@@ -3906,10 +8463,302 @@ get_uptime()
 	eval $LOGFE
 }
 
+get_weather_data()
+{
+	eval $LOGFS
+	
+	local location_site='http://geoip.ubuntu.com/lookup'
+	local weather_feed='http://api.wunderground.com/auto/wui/geo/WXCurrentObXML/index.xml?query='
+	local weather_spider='http://wunderground.com/'
+	local data_grab_error='' wget_error=0 
+	local b_test_loc=false b_test_weather=false b_debug=false
+	local test_dir="$HOME/bin/scripts/inxi/data/weather/"
+	local test_location='location2.xml' test_weather='weather-feed.xml'
+	local location_data='' location='' weather_data='' location_array_value='' a_location=''
+	local weather_array_value='' site_elevation='' temp_array=''
+	
+	# first we get the location data, once that is parsed and handled, we move to getting the 
+	# actual weather data, assuming no errors
+	if [[ -n $ALTERNATE_WEATHER_LOCATION ]];then
+		# note, this api does not support spaces in names, replace spaces with + sign.
+		location=$ALTERNATE_WEATHER_LOCATION
+		# echo $ALTERNATE_WEATHER_LOCATION;exit
+	else
+		if [[ $b_test_loc != 'true' ]];then
+			location_data=$( wget -q -t 1 -T $WGET_TIMEOUT -O- $location_site || wget_error=$? )
+			log_function_data "$location_data"
+			if [[ $wget_error -ne 0 ]];then
+				data_grab_error="Error: location server up but download error - wget: $wget_error"
+			fi
+			wget_error=0
+		else
+			if [[ -f $test_dir$test_location ]];then
+				location_data="$( cat $test_dir$test_location )"
+			else
+				data_grab_error="Error: location xml local file not found."
+			fi
+		fi
+		if [[ -n $data_grab_error ]];then
+			:
+		elif [[ -z $( grep -i '<Response' <<< $location_data ) ]];then
+			data_grab_error="Error: location downloaded but data contains no xml."
+		else
+			# clean up xml and make easy to process with newlines, note, bsd sed has no support for inserting
+			# \n dircctly so we have to use this hack
+			# location_data="$( sed $SED_RX 's|><|>\n<|g' <<< $location_data )"
+			location_data="$( sed $SED_RX 's|><|>\
+<|g' <<< $location_data )"
+			# echo -e "ld:\n$location_data"
+			location_array_value=$( gawk '
+			function clean(data) {
+				returnData=""
+				# some lines might be empty, so ignore those
+				if (data !~ /^<[^>]+>$/ ) {
+					returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
+				}
+				return returnData
+			}
+			BEGIN {
+				IGNORECASE=1
+				locationString=""
+				countryCode=""
+				countryCode3=""
+				countryName=""
+				regionCode=""
+				regionName=""
+				city=""
+				postalCode=""
+				latitude=""
+				longitude=""
+				timeZone=""
+				areaCode=""
+			}
+			/CountryCode/ {
+				if ( $0 ~ /CountryCode3/ ){
+					countryCode3=clean($0)
+				}
+				else {
+					countryCode=clean($0)
+				}
+			}
+			/CountryName/ {
+				countryName = clean($0)
+			}
+			/RegionCode/ {
+				regionCode = clean($0)
+			}
+			/RegionName/ {
+				regionName = clean($0)
+			}
+			/City/ {
+				city = clean($0)
+			}
+			/ZipPostalCode/ {
+				postalCode = clean($0)
+			}
+			/Latitude/ {
+				latitude = clean($0)
+			}
+			/Longitude/ {
+				longitude = clean($0)
+			}
+			/TimeZone/ {
+				timeZone = clean($0)
+			}
+			END {
+				locationString = city ";" regionCode ";" regionName ";" countryName ";" countryCode ";" countryCode3 
+				locationString = locationString  ";" latitude "," longitude ";" postalCode ";" timeZone
+				print locationString
+			}' <<< "$location_data" )
+		fi
+		A_WEATHER_DATA[0]=$location_array_value
+		IFS=";"
+		a_location=( ${A_WEATHER_DATA[0]} )
+		IFS="$ORIGINAL_IFS"
+		
+		# assign location, cascade from most accurate
+		# latitude,longitude first
+		if [[ -n ${a_location[6]} ]];then
+			location="${a_location[6]}"
+		# city,state next
+		elif [[ -n ${a_location[0]} && -n ${a_location[1]} ]];then
+			location="${a_location[0]},${a_location[1]}"
+		# postal code last, that can be a very large region
+		elif [[ -n ${a_location[7]} ]];then
+			location=${a_location[7]}
+		fi
+	fi
+	if [[ $b_debug == 'true' ]];then
+		echo -e "location array:\n${A_WEATHER_DATA[0]}"
+		echo "location: $location"
+	fi
+	log_function_data "location: $location"
+	
+	if [[ -z $location && -z $data_grab_error ]];then
+		data_grab_error="Error: location data downloaded but no location detected."
+	fi
+
+	# now either dump process or go on to get weather data
+	if [[ -z $data_grab_error ]];then
+		if [[ $b_test_weather != 'true' ]];then
+			weather_data="$( wget -q -t 1 -T $WGET_TIMEOUT -O- $weather_feed"$location" || wget_error=$? )"
+			if [[ $wget_error -ne 0 ]];then
+				data_grab_error="Error: weather server up but download error - wget: $wget_error"
+			fi
+			log_function_data "$weather_data"
+		else
+			if [[ -f $test_dir$test_weather ]];then
+				weather_data="$( cat $test_dir$test_weather)"
+			else
+				data_grab_error="Error: weather feed xml local file not found."
+			fi
+		fi
+		if [[ -z $data_grab_error && -z $( grep -i '<current_observation' <<< $weather_data ) ]];then
+			data_grab_error="Error: weather data downloaded but shows no xml start."
+		fi
+		if [[ -z $data_grab_error ]];then
+			# trim off zeros
+			weather_data=$( sed 's/^[[:space:]]*//' <<< "$weather_data" )
+			site_elevation=$( grep -im 1 '<elevation>' <<< "$weather_data" | sed $SED_RX -e 's/<[^>]*>//g' \
+			-e 's/\.[0-9]*//' )
+			# we need to grab the location data from the feed for remote checks 
+			if [[ -n $ALTERNATE_WEATHER_LOCATION && -n $weather_data ]];then
+				location_data=$( sed -e '/<current_observation>/,/<display_location>/d' -e '/<\/display_location>/,/<\/current_observation>/d' <<< "$weather_data" )
+				# echo -e "ld1:\n$location_data"
+				A_WEATHER_DATA[0]=$( gawk '
+				function clean(data) {
+					returnData=""
+					# some lines might be empty, so ignore those
+					if (data !~ /^<[^>]+>$/ ) {
+						returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
+						gsub(/^[[:space:]]+|[[:space:]]+$|^NA$|^N\/A$/, "", returnData)
+					}
+					return returnData
+				}
+				BEGIN {
+					IGNORECASE=1
+					city=""
+					state=""
+					country=""
+				}
+				/<city>/ {
+					city=clean($0)
+				}
+				/<state>/ {
+					state=clean($0)
+				}
+				/<country>/ {
+					country=clean($0)
+				}
+				END {
+					print city ";" state ";;;;" country
+				}' <<< "$location_data" )
+				# echo -e "location:\n${A_WEATHER_DATA[0]}"
+			fi
+			
+			# clean off everything before/after observation_location
+			weather_data=$( sed -e '/<current_observation>/,/<observation_location>/d' \
+			-e '/<icons>/,/<\/current_observation>/d' <<< "$weather_data" -e 's/^[[:space:]]*$//g' -e '/^$/d' )
+			
+			# echo "$weather_data";exit 
+			weather_array_value=$( gawk -v siteElevation="$site_elevation" '
+			function clean(data) {
+				returnData=""
+				# some lines might be empty, so ignore those
+				if (data !~ /^<[^>]+>$/ ) {
+					returnData=gensub(/(.*>)([^<]*)(<.*)/, "\\2", 1, data)
+					gsub(/^[[:space:]]+|[[:space:]]+$|^NA$|^N\/A$/, "", returnData)
+				}
+				return returnData
+			}
+			BEGIN {
+				IGNORECASE=1
+				observationTime=""
+				localTime=""
+				weather=""
+				tempString=""
+				humidity=""
+				windString=""
+				pressureString=""
+				dewpointString=""
+				heatIndexString=""
+				windChillString=""
+				weatherString=""
+			}
+			/observation_time>/ {
+				observationTime=clean($0)
+				sub(/Last Updated on /, "", observationTime )
+			}
+			/local_time>/ {
+				localTime=clean($0)
+			}
+			/<weather/ {
+				weather=clean($0)
+			}
+			/temperature_string/ {
+				tempString=clean($0)
+			}
+			/relative_humidity/ {
+				humidity=clean($0)
+			}
+			/wind_string/ {
+				windString=clean($0)
+			}
+			/pressure_string/ {
+				pressureString=clean($0)
+			}
+			/heat_index_string/ {
+				heatIndexString=clean($0)
+			}
+			/windchill_string/ {
+				windChillString=clean($0)
+			}
+			END {
+				weatherString = observationTime ";" localTime ";" weather ";" tempString ";" humidity 
+				weatherString = weatherString ";" windString ";" pressureString ";" dewpointString ";" heatIndexString
+				weatherString = weatherString ";" windChillString ";" siteElevation
+				print weatherString
+			}' <<< "$weather_data" )
+		fi
+		if [[ -z $weather_array_value ]];then
+			data_grab_error="Error: weather info downloaded but no data detected."
+		else
+			A_WEATHER_DATA[1]=$weather_array_value
+		fi
+	fi
+	# now either dump process or go on to get weather data
+	if [[ -n $data_grab_error ]];then
+		A_WEATHER_DATA=$data_grab_error
+		log_function_data "data grab error: $data_grab_error"
+	fi
+	
+	if [[ $b_debug == 'true' ]];then
+		echo "site_elevation: $site_elevation"
+		echo "${A_WEATHER_DATA[1]}"
+	fi
+	temp_array=${A_WEATHER_DATA[@]}
+	log_function_data "A_WEATHER_DATA: $temp_array"
+	
+	eval $LOGFE
+}
+# ALTERNATE_WEATHER_LOCATION='portland,or'
+# get_weather_data;exit
+
 #### -------------------------------------------------------------------
 #### special data handling for specific options and conditions
 #### -------------------------------------------------------------------
 
+# args: $1 - string to strip color code characters out of
+# returns count of string length minus colors
+calculate_line_length()
+{
+	local string="$1"
+	# ansi:  irc: \x0312
+	string=$( sed -e "s/\x1b\[[0-9]\{1,2\}\(;[0-9]\{1,2\}\)\{0,2\}m//g" -e "s/\\\x0[0-9]\{1,3\}//g" <<< $string )
+	count=${#string}
+	echo $count
+}
+
 ## multiply the core count by the data to be calculated, bmips, cache
 # args: $1 - string to handle; $2 - cpu count
 calculate_multicore_data()
@@ -3917,18 +8766,18 @@ calculate_multicore_data()
 	eval $LOGFS
 	local string_number=$1 string_data=''
 
-	if [[ -n $( egrep -i '( mb| kb)' <<< $1 ) ]];then
+	if [[ -n $( grep -Ei '( mb| kb)' <<< $1 ) ]];then
 		string_data=" $( gawk '{print $2}' <<< $1 )" # add a space for output
 		string_number=$( gawk '{print $1}' <<< $1 )
 	fi
 	# handle weird error cases where it's not a number
-	if [[ -n $( egrep '^[0-9\.,]+$' <<< $string_number ) ]];then
+	if [[ -n $( grep -E '^[0-9\.,]+$' <<< $string_number ) ]];then
 		string_number=$( echo $string_number $2 | gawk '{
 			total = $1*$2
 			print total
 		}' )
 	elif [[ $string_number == '' ]];then
-		string_number='Not Available'
+		string_number='N/A'
 	else
 		# I believe that the above returns 'unknown' by default so no need for extra text
 		string_number="$string_number "
@@ -3943,8 +8792,16 @@ calculate_multicore_data()
 process_cpu_flags()
 {
 	eval $LOGFS
+	
+	local cpu_flags_working=$1
+	local bits=$( uname -m | grep 64 )
+	
+	# no need to show pae for 64 bit cpus, it's pointless
+	if [[ -n $bits ]];then
+		cpu_flags_working=$( sed 's/[[:space:]]*pae//' <<< "$cpu_flags_working" )
+	fi
 	# must have a space after last item in list for RS=" "
-	local cpu_flags_working="$1 "
+	cpu_flags_working="$cpu_flags_working "
 	
 	# nx = AMD stack protection extensions
 	# lm = Intel 64bit extensions
@@ -3959,7 +8816,8 @@ process_cpu_flags()
 		i = 1 # start at one because of for increment issue
 		flag_string = ""
 	}
-	/^(lm|nx|pni|svm|vmx|(sss|ss)e([2-9])?([a-z])?(_[0-9])?)$/ {
+	
+	/^(lm|nx|pae|pni|svm|vmx|(sss|ss)e([2-9])?([a-z])?(_[0-9])?)$/ {
 		if ( $0 == "pni" ){
 			a_flags[i] = "sse3"
 		}
@@ -3980,8 +8838,7 @@ process_cpu_flags()
 			}
 		}
 		print flag_string
-	}' 
-	)
+	}' )
 
 	#grep -oE '\<(nx|lm|sse[0-9]?|pni|svm|vmx)\>' | tr '\n' ' '))
 	if [[ -z $cpu_flags ]];then
@@ -4002,38 +8859,56 @@ print_it_out()
 {
 	eval $LOGFS
 	# note that print_it_out passes local variable values on to its children,
-	# and in some cases, their children, with Lspci_Data
-	local Lspci_Data='' # only for verbose
+	# and in some cases, their children, with Lspci_v_Data
+	local Lspci_v_Data='' Lspci_n_Data='' # only for verbose
+	local Sysctl_a_Data='' Dmesg_Boot_Data=''
+	
+	if [[ -n $BSD_TYPE ]];then
+		Sysctl_a_Data="$( get_sysctl_data 'a' )"
+		Dmesg_Boot_Data="$( get_dmesg_boot_data )"
+	fi
 
 	if [[ $B_SHOW_SHORT_OUTPUT == 'true' ]];then
 		print_short_data
 	else
-		Lspci_Data="$( get_lspci_data )"
-		if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_SYSTEM == 'true' ]];then
+		Lspci_v_Data="$( get_lspci_data 'v' )"
+		if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+			Lspci_n_Data="$( get_lspci_data 'n' )"
+		fi
+		if [[ $B_SHOW_SYSTEM == 'true' ]];then
 			print_system_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_CPU == 'true' ]];then
+		if [[ $B_SHOW_MACHINE == 'true' ]];then
+			print_machine_data
+		fi
+		if [[ $B_SHOW_WEATHER == 'true' ]];then
+			print_weather_data
+		fi
+		if [[ $B_SHOW_BASIC_CPU == 'true' || $B_SHOW_CPU == 'true' ]];then
 			print_cpu_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_GRAPHICS == 'true' ]];then
-			print_gfx_data
+		if [[ $B_SHOW_GRAPHICS == 'true' ]];then
+			print_graphics_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 5 || $B_SHOW_AUDIO == 'true' ]];then
+		if [[ $B_SHOW_AUDIO == 'true' ]];then
 			print_audio_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 2 || $B_SHOW_NETWORK == 'true' ]];then
+		if [[ $B_SHOW_NETWORK == 'true' ]];then
 			print_networking_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_DISK == 'true' ]];then
+		if [[ $B_SHOW_DISK_TOTAL == 'true' || $B_SHOW_BASIC_DISK == 'true' || $B_SHOW_DISK == 'true' ]];then
 			print_hard_disk_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 4 || $B_SHOW_PARTITIONS == 'true' ]];then
+		if [[ $B_SHOW_PARTITIONS == 'true' ]];then
 			print_partition_data
 		fi
+		if [[ $B_SHOW_RAID == 'true' || $B_SHOW_BASIC_RAID == 'true' ]];then
+			print_raid_data
+		fi
 		if [[ $B_SHOW_UNMOUNTED_PARTITIONS == 'true' ]];then
 			print_unmounted_partition_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 5 || $B_SHOW_SENSORS == 'true' ]];then
+		if [[ $B_SHOW_SENSORS == 'true' ]];then
 			print_sensors_data
 		fi
 		if [[ $B_SHOW_REPOS == 'true' ]];then
@@ -4042,7 +8917,7 @@ print_it_out()
 		if [[ $B_SHOW_PS_CPU_DATA == 'true' || $B_SHOW_PS_MEM_DATA == 'true' ]];then
 			print_ps_data
 		fi
-		if [[ $VERBOSITY_LEVEL -ge 1 || $B_SHOW_INFO == 'true' ]];then
+		if [[ $B_SHOW_INFO == 'true' ]];then
 			print_info_data
 		fi
 	fi
@@ -4055,8 +8930,8 @@ print_it_out()
 print_short_data()
 {
 	eval $LOGFS
-	local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
-	local processes="$(( $( ps aux | wc -l ) - 1 ))"
+	local current_kernel=$( get_kernel_version ) 
+	local processes=$(( $( wc -l <<< "$Ps_aux_Data" ) - 1 ))
 	local short_data='' i='' b_background_black='false'
 	local memory=$( get_memory_data )
 	local up_time="$( get_uptime )"
@@ -4098,9 +8973,17 @@ print_short_data()
 	local cpu_model="${a_cpu_working[0]}"
 	## assemble data for output
 	local cpu_clock="${a_cpu_working[1]}" # old CPU3
-	# this gets that weird min/max final array item
+	# this gets that weird min/max final array item, which almost never contains any data of use
 	local min_max_clock_nu=$(( ${#A_CPU_DATA[@]} - 1 ))
 	local min_max_clock=${A_CPU_DATA[$min_max_clock_nu]}
+	# this handles the case of for example ARM cpus, which will not have data for
+	# min/max, since they don't have speed. Since that sets a flag, not found, just
+	# look for that and use the speed from the first array array, same where we got 
+	# model from
+	if [[ "$min_max_clock" == 'N/A' && ${a_cpu_working[1]} != '' ]];then
+		min_max_clock="${a_cpu_working[1]} MHz"
+	fi
+	local patch_version_number=$( get_patch_version_string )
 
 	#set_color_scheme 12
 	if [[ $B_RUNNING_IN_SHELL == 'false' ]];then
@@ -4125,12 +9008,12 @@ print_short_data()
 			#C1="${C1},1"; C2="${C2},1"; CN="${CN},1"
 		fi
 	fi
-	short_data="${C1}CPU$cpc_plural${CN}[${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP1}${CN}] ${C1}Kernel${CN}[${C2}${SEP1}${current_kernel}${SEP1}${CN}] ${C1}Up${CN}[${C2}${SEP1}${up_time}${SEP1}${CN}] ${C1}Mem${CN}[${C2}${SEP1}${memory}${SEP1}${CN}] ${C1}HDD${CN}[${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP1}${CN}] ${C1}Procs${CN}[${C2}${SEP1}${processes}${SEP1}${CN}]"
+	short_data="${C1}CPU$cpc_plural${C2}${SEP1}${cpu_data_string} ${cpu_model}$model_plural (${cpu_type}) clocked at ${min_max_clock}${SEP2}${C1}Kernel${C2}${SEP1}${current_kernel}${SEP2}${C1}Up${C2}${SEP1}${up_time}${SEP2}${C1}Mem${C2}${SEP1}${memory}${SEP2}${C1}HDD${C2}${SEP1}${hdd_capacity}($hdd_used)${SEP2}${C1}Procs${C2}${SEP1}${processes}${SEP2}"
 
 	if [[ $SHOW_IRC -gt 0 ]];then
-		short_data="${short_data} ${C1}Client${CN}[${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP1}${CN}]"
+		short_data="${short_data}${C1}Client${C2}${SEP1}${IRC_CLIENT}${IRC_CLIENT_VERSION}${SEP2}"
 	fi
-	short_data="${short_data} ${C1}$SCRIPT_NAME${C2}${CN}[${C2}${SEP1}$SCRIPT_VERSION_NUMBER${SEP1}${CN}]"
+	short_data="${short_data}${C1}$SCRIPT_NAME${C2}${SEP1}$SCRIPT_VERSION_NUMBER$patch_version_number${SEP2}${CN}"
 	if [[ $SCHEME -gt 0 ]];then
 		short_data="${short_data} $NORMAL"
 	fi
@@ -4144,90 +9027,143 @@ print_short_data()
 print_audio_data()
 {
 	eval $LOGFS
-	local i='' card_one='Card-1' audio_data='' a_audio_data='' port_data='' pci_bus_id=''
-	local a_audio_working='' alsa_driver='' alsa_data='' port_plural='' module_version=''
+	local i='' card_id='' audio_data='' a_audio_data='' port_data='' pci_bus_id='' card_string=''
+	local a_audio_working='' audio_driver='' alsa_data='' port_plural='' module_version='' chip_id=''
+	local bus_usb_text='' bus_usb_id='' line_starter='Audio:' alsa='' alsa_version='' print_data=''
+	local driver=''
 	# set A_AUDIO_DATA and get alsa data
-	get_audio_data
-	alsa_data=$( get_audio_alsa_data )
-	IFS=","
-	a_audio_working=(${A_AUDIO_DATA[0]})
-	IFS="$ORIGINAL_IFS"
-
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		if [[ $B_PCICONF_SET == 'false' ]];then
+			get_pciconf_data
+		fi
+		get_pciconf_card_data 'audio'
+	else
+		get_audio_data
+	fi
+	
+	get_audio_alsa_data
+	# alsa driver data now prints out no matter what
+	if [[ -n $A_ALSA_DATA ]];then
+		IFS=","
+		if [[ -n ${A_ALSA_DATA[0]} ]];then
+			alsa=${A_ALSA_DATA[0]}
+		else
+			alsa='N/A'
+		fi
+		if [[ -n ${A_ALSA_DATA[1]} ]];then
+			alsa_version=${A_ALSA_DATA[1]}
+		else
+			alsa_version='N/A'
+		fi
+		alsa_data="${C1}Sound:${C2} $alsa ${C1}ver$SEP3${C2} $alsa_version"
+		IFS="$ORIGINAL_IFS"
+	fi
+	# note, error handling is done in the get function, so this will never be null, but
+	# leaving the test just in case it's changed.
 	if [[ -n ${A_AUDIO_DATA[@]} ]];then
-		# slightly complicated because 2nd array item could be the alsa data
-		if [[ ${#A_AUDIO_DATA[@]} -le 1 ]];then
-			card_one='Card'
-		fi
-
-# 		if [[ -n ${a_audio_working[2]} ]];then
-# 			port_data=" ${C1}at port${C2} ${a_audio_working[2]}"
-# 		fi
-		# this should only trigger if the $FILE_ASOUND_DEVICE data is used, not lspci -nn
-		if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
-			# note that for some reason, the module name is not the same as the module
-			# loaded to kernel name for audio drivers, and you'll need to change the -
-			module_version=$( print_module_version "${a_audio_working[3]}" 'audio' )
-		elif [[ -n ${a_audio_working[1]} && $B_EXTRA_DATA == 'true' ]];then
-			module_version=$( print_module_version "${a_audio_working[1]}" 'audio' )
-		fi
-		if [[ -n ${a_audio_working[1]} ]];then
-			alsa_driver=" ${C1}driver${C2} ${a_audio_working[1]}$module_version"
-		fi
-		if [[ -n ${a_audio_working[2]} && $B_EXTRA_DATA == 'true' ]];then
-			if [[ $( wc -w <<< ${a_audio_working[2]} ) -gt 1 ]];then
-				port_plural='s'
-			fi
-			port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
-		fi
-		if [[ -n ${a_audio_working[4]} && $B_EXTRA_DATA == 'true' ]];then
-			pci_bus_id=" ${C1}BusID:${C2} ${a_audio_working[4]}"
-		fi
-		audio_data="${C1}$card_one${C2} ${a_audio_working[0]}$alsa_driver$port_data$pci_bus_id"
-		audio_data=$( create_print_line "Audio:" "$audio_data" )
-		print_screen_output "$audio_data"
-		i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
-		while [[ -n ${A_AUDIO_DATA[++i]} ]]
+		for (( i=0; i< ${#A_AUDIO_DATA[@]}; i++ ))
 		do
 			IFS=","
 			a_audio_working=( ${A_AUDIO_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
 			port_data=''
-			alsa_driver=''
+			audio_driver=''
+			audio_data=''
+			card_string=''
 			port_plural=''
 			module_version=''
 			pci_bus_id=''
-			if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
-				module_version=$( print_module_version "${a_audio_working[3]}" 'audio' )
-			elif [[ -n ${a_audio_working[1]} && $B_EXTRA_DATA == 'true' ]];then
-				module_version=$( print_module_version "${a_audio_working[1]}" 'audio' )
+			bus_usb_text=''
+			bus_usb_id=''
+			print_data=''
+			card_id=''
+			chip_id=''
+			
+			if [[ ${#A_AUDIO_DATA[@]} -gt 1 ]];then
+				card_id="-$(( $i + 1 ))"
+			fi
+			if [[ $BSD_TYPE != 'bsd' ]];then
+				if [[ -n ${a_audio_working[3]} && $B_EXTRA_DATA == 'true' ]];then
+					module_version=$( print_module_version "${a_audio_working[3]}" 'audio' )
+				elif [[ -n ${a_audio_working[1]} && $B_EXTRA_DATA == 'true' ]];then
+					module_version=$( print_module_version "${a_audio_working[1]}" 'audio' )
+				fi
 			fi
 			# we're testing for the presence of the 2nd array item here, which is the driver name
 			if [[ -n ${a_audio_working[1]} ]];then
-				alsa_driver="${C1}driver${C2} ${a_audio_working[1]}"
+				# note: linux drivers can have numbers, like tg3
+				if [[ $BSD_TYPE == 'bsd' ]];then
+					driver=$( sed 's/[0-9]$//' <<< ${a_audio_working[1]} )
+				else
+					driver=${a_audio_working[1]}
+				fi
+				audio_driver="${C1}driver$SEP3${C2} ${driver} "
 			fi
 			if [[ -n ${a_audio_working[2]} && $B_EXTRA_DATA == 'true' ]];then
 				if [[ $( wc -w <<< ${a_audio_working[2]} ) -gt 1 ]];then
 					port_plural='s'
 				fi
-				port_data=" ${C1}at port$port_plural${C2} ${a_audio_working[2]}"
+				port_data="${C1}port$port_plural$SEP3${C2} ${a_audio_working[2]} "
 			fi
 			if [[ -n ${a_audio_working[4]} && $B_EXTRA_DATA == 'true' ]];then
-				pci_bus_id=" ${C1}BusID:${C2} ${a_audio_working[4]}"
+				if [[ ${a_audio_working[1]} != 'USB Audio' ]];then
+					bus_usb_text='bus-ID'
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						if [[ $BSD_TYPE != 'bsd' ]];then
+							chip_id=$( get_lspci_chip_id "${a_audio_working[4]}" )
+						else
+							chip_id=${a_audio_working[6]}
+						fi
+					fi
+				else
+					bus_usb_text='usb-ID'
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						chip_id=${a_audio_working[5]}
+					fi
+				fi
+				bus_usb_id=${a_audio_working[4]}
+				pci_bus_id="${C1}$bus_usb_text$SEP3${C2} $bus_usb_id "
+				if [[ -n $chip_id ]];then
+					chip_id="${C1}chip-ID$SEP3${C2} $chip_id "
+				fi
 			fi
 			if [[ -n ${a_audio_working[0]} ]];then
-				audio_data="${C1}Card-$(( $i + 1 ))${C2} ${a_audio_working[0]}$alsa_driver$port_data$pci_bus_id"
+				card_string="${C1}Card$card_id:${C2} ${a_audio_working[0]} "
+				audio_data="$audio_driver$port_data$pci_bus_id$chip_id"
+			fi
+			# only print alsa on last line if short enough, otherwise print on its own line
+			if [[ $i -eq 0 ]];then
+				if [[ -n $alsa_data && $( calculate_line_length "$card_string${audio_data}$alsa_data" ) -lt $COLS_INNER ]];then
+					audio_data="$audio_data$alsa_data"
+					alsa_data=''
+				fi
 			fi
 			if [[ -n $audio_data ]];then
-				audio_data=$( create_print_line " " "$audio_data" )
-				print_screen_output "$audio_data"
+				if [[ $( calculate_line_length "$card_string$audio_data" ) -lt $COLS_INNER ]];then
+					print_data=$( create_print_line "$line_starter" "$card_string$audio_data" )
+					print_screen_output "$print_data"
+				# print the line
+				else
+					# keep the driver on the same line no matter what, looks weird alone on its own line
+					if [[ $B_EXTRA_DATA != 'true' ]];then
+						print_data=$( create_print_line "$line_starter" "$card_string$audio_data" )
+						print_screen_output "$print_data"
+					else
+						print_data=$( create_print_line "$line_starter" "$card_string" )
+						print_screen_output "$print_data"
+						line_starter=' '
+						print_data=$( create_print_line "$line_starter" "$audio_data" )
+						print_screen_output "$print_data"
+					fi
+				fi
+				line_starter=' '
 			fi
 		done
-		# alsa driver data only prints out if sound card data is found
-		if [[ -n $alsa_data ]];then
-			audio_data="${C1}Sound:${C2} $alsa_data"
-			audio_data=$( create_print_line " " "$audio_data" )
-			print_screen_output "$audio_data"
-		fi
+	fi
+	if [[ -n $alsa_data ]];then
+		alsa_data=$( sed 's/ALSA/Advanced Linux Sound Architecture/' <<< $alsa_data )
+		alsa_data=$( create_print_line "$line_starter" "$alsa_data" )
+		print_screen_output "$alsa_data"
 	fi
 	eval $LOGFE
 }
@@ -4236,7 +9172,11 @@ print_cpu_data()
 {
 	eval $LOGFS
 	local cpu_data='' i='' cpu_clock_speed='' cpu_multi_clock_data=''
-	local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags=''
+	local bmip_data='' cpu_cache='' cpu_vendor='' cpu_flags='' flag_feature='flags'
+	local a_cpu_working='' cpu_model='' cpu_clock='' cpu_null_error=''
+	local cpc_plural='' cpu_count_print='' model_plural='' cpu_data_string=''
+	local cpu_physical_count='' cpu_core_count='' cpu_core_alpha='' cpu_type=''
+	local cpu_2_data=''
 
 	##print_screen_output "A_CPU_DATA[0]=\"${A_CPU_DATA[0]}\""
 	# Array A_CPU_DATA always has one extra element: max clockfreq found.
@@ -4245,29 +9185,9 @@ print_cpu_data()
 	get_cpu_data
 
 	IFS=","
-	local a_cpu_working=(${A_CPU_DATA[0]})
+	a_cpu_working=(${A_CPU_DATA[0]})
 	IFS="$ORIGINAL_IFS"
-	local cpu_model="${a_cpu_working[0]}"
-	## assemble data for output
-	local cpu_clock="${a_cpu_working[1]}"
-
-	cpu_vendor=${a_cpu_working[5]}
-
-	# set A_CPU_CORE_DATA
-	get_cpu_core_count
-	local cpc_plural='' cpu_count_print='' model_plural=''
-	local cpu_physical_count=${A_CPU_CORE_DATA[0]}
-	local cpu_core_count=${A_CPU_CORE_DATA[3]}
-	local cpu_core_alpha=${A_CPU_CORE_DATA[1]}
-	local cpu_type=${A_CPU_CORE_DATA[2]}
-
-	if [[ $cpu_physical_count -gt 1 ]];then
-		cpc_plural='(s)'
-		cpu_count_print="$cpu_physical_count "
-		model_plural='s'
-	fi
 
-	local cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
 	# Strange (and also some expected) behavior encountered. If print_screen_output() uses $1
 	# as the parameter to output to the screen, then passing "<text1> ${ARR[@]} <text2>"
 	# will output only <text1> and first element of ARR. That "@" splits in elements and "*" _doesn't_,
@@ -4275,58 +9195,118 @@ print_cpu_data()
 	# This has been confirmed by #bash on freenode.
 	# The above mentioned only emerges when using the debugging markers below
 	## print_screen_output "a_cpu_working=\"***${a_cpu_working[@]} $hostName+++++++\"----------"
+	# unless all these are null, process whatever you have
+	if [[ -n ${a_cpu_working[0]} || -n ${a_cpu_working[1]} || -n ${a_cpu_working[2]} || -n ${a_cpu_working[3]} ]];then
+		cpu_model="${a_cpu_working[0]}"
+		## assemble data for output
+		cpu_clock="${a_cpu_working[1]}"
+
+		cpu_vendor=${a_cpu_working[5]}
+
+		# set A_CPU_CORE_DATA
+		get_cpu_core_count
+		cpu_physical_count=${A_CPU_CORE_DATA[0]}
+		cpu_core_count=${A_CPU_CORE_DATA[3]}
+		cpu_core_alpha=${A_CPU_CORE_DATA[1]}
+		cpu_type=${A_CPU_CORE_DATA[2]}
+		
+		if [[ $cpu_physical_count -gt 1 ]];then
+			cpc_plural='(s)'
+			cpu_count_print="$cpu_physical_count "
+			model_plural='s'
+		fi
 
-	if [[ -z ${a_cpu_working[2]} ]];then
-		a_cpu_working[2]="unknown"
-	fi
-
-	cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural (${cpu_type})" )
-	if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_CPU == 'true' ]];then
-		# update for multicore, bogomips x core count.
-		if [[ $B_EXTRA_DATA == 'true' ]];then
-# 			if [[ $cpu_vendor != 'intel' ]];then
-				bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
-# 			else
-# 				bmip_data="${a_cpu_working[4]}"
-# 			fi
-			bmip_data=" ${C1}bmips${C2} $bmip_data"
-		fi
-		## 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
-		if [[ $cpu_vendor != 'intel' ]];then
-			cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$(( $cpu_core_count * $cpu_physical_count ))"  )
+		cpu_data_string="${cpu_count_print}${cpu_core_alpha} core"
+		cpu_data=$( create_print_line "CPU$cpc_plural:" "${C1}${cpu_data_string}${C2} ${a_cpu_working[0]}$model_plural (${cpu_type})" )
+		if [[ $B_SHOW_CPU == 'true' ]];then
+			# update for multicore, bogomips x core count.
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+	# 			if [[ $cpu_vendor != 'intel' ]];then
+				# ARM may use the faked 1 cpucorecount to make this work
+				# echo $cpu_core_count $cpu_physical_count
+				if [[ -n ${a_cpu_working[4]} ]];then
+					bmip_data=$( calculate_multicore_data "${a_cpu_working[4]}" "$(( $cpu_core_count * $cpu_physical_count ))" )
+				fi
+	# 			else
+	# 				bmip_data="${a_cpu_working[4]}"
+	# 			fi
+				# bogomips are a linux thing, but my guess is over time bsds will use them somewhere anyway
+				if [[ $BSD_TYPE == 'bsd' && -z $bmip_data ]];then
+					bmip_data=''
+				else
+					bmip_data="${C1}bmips$SEP3${C2} $bmip_data "
+				fi
+			fi
+			## 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
+			if [[ -n ${a_cpu_working[2]} ]];then
+				if [[ $cpu_vendor != 'intel' ]];then
+					cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$(( $cpu_core_count * $cpu_physical_count ))"  )
+				else
+					cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$cpu_physical_count"  )
+				fi
+			else
+				cpu_cache='N/A'
+			fi
+			# only print shortened list
+			if [[ $B_CPU_FLAGS_FULL != 'true' ]];then
+				# gawk has already sorted this output, no flags returns -
+				if [[ $B_EXTRA_DATA == 'true' ]];then
+					cpu_flags=$( process_cpu_flags "${a_cpu_working[3]}" "${a_cpu_working[6]}" )
+					cpu_flags="($cpu_flags)"
+					if [[ ${a_cpu_working[6]} == 'true' ]];then
+						flag_feature='features'
+					fi
+					cpu_flags="${C1}$flag_feature$SEP3${C2} $cpu_flags "
+				fi
+			fi
+			# arm cpus do not have flags or cache
+			if [[ ${a_cpu_working[6]} != 'true' ]];then
+				cpu_data="$cpu_data${C2} ${C1}cache$SEP3${C2} $cpu_cache${CN}"
+				cpu_2_data="$cpu_flags$bmip_data${CN}"
+			else
+				cpu_data="$cpu_data${C2} (ARM)$bmip_data${CN}"
+			fi
+		fi
+		# we don't this printing out extra line unless > 1 cpu core
+		if [[ ${#A_CPU_DATA[@]} -gt 2 && $B_SHOW_CPU == 'true' ]];then
+			cpu_clock_speed='' # null < verbosity level 5
 		else
-			cpu_cache=$( calculate_multicore_data "${a_cpu_working[2]}" "$cpu_physical_count"  )
+			cpu_data="$cpu_data ${C1}clocked at${C2} ${a_cpu_working[1]} MHz${CN}"
 		fi
-		# only print shortened list
-		if [[ $B_CPU_FLAGS_FULL != 'true' ]];then
-			cpu_flags=$( process_cpu_flags "${a_cpu_working[3]}" )
-			cpu_flags=" ${C1}flags${C2} ($cpu_flags)"
+		cpu_2_data="$cpu_2_data$cpu_clock_speed"
+	else
+		if [[ $BSD_TYPE == 'bsd' && $B_ROOT != 'true' ]];then
+			cpu_null_error=' No permissions for sysctl use?'
 		fi
-		cpu_data="$cpu_data${C2} ${C1}cache${C2} $cpu_cache$cpu_flags$bmip_data${CN}"
-	fi
-	# we don't this printing out extra line unless > 1 cpu core
-	if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
-		cpu_clock_speed='' # null < verbosity level 5
+		cpu_data=$( create_print_line "CPU:" "${C2}No CPU data available.$cpu_null_error" )
+	fi
+	# echo ln: $( calculate_line_length "$cpu_data $cpu_2_data" )
+	# echo icols: $COLS_INNER
+	# echo tc: $TERM_COLUMNS
+	# echo :$cpu_2_data:
+	if [[ -n $cpu_2_data && $( calculate_line_length "$cpu_data $cpu_2_data" ) -gt $COLS_INNER ]];then
+		print_screen_output "$cpu_data"
+		cpu_data=$( create_print_line " " "$cpu_2_data" )
+		print_screen_output "$cpu_data"
 	else
-		cpu_data="$cpu_data ${C1}clocked at${C2} ${a_cpu_working[1]} MHz${CN}"
+		print_screen_output "$cpu_data $cpu_2_data"
 	fi
-
-	cpu_data="$cpu_data $cpu_clock_speed"
-	print_screen_output "$cpu_data"
-
 	# we don't this printing out extra line unless > 1 cpu core
-	if [[ ${#A_CPU_DATA[@]} -gt 2 ]] && [[ $B_SHOW_CPU == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
+	# note the numbering, the last array item is the min/max/not found for cpu speeds
+	if [[ ${#A_CPU_DATA[@]} -gt 2 && $B_SHOW_CPU == 'true' ]];then
 		for (( i=0; i < ${#A_CPU_DATA[@]}-1; i++ ))
 		do
 			IFS=","
 			a_cpu_working=(${A_CPU_DATA[i]})
 			IFS="$ORIGINAL_IFS"
 			# note: the first iteration will create a first space, for color code separation below
-			cpu_multi_clock_data="$cpu_multi_clock_data ${C1}($(( i + 1 )))${C2} ${a_cpu_working[1]} MHz${CN}"
-			if [[ $i -gt 10 ]];then
-				break
-			fi
+			cpu_multi_clock_data="$cpu_multi_clock_data ${C1}$(( i + 1 )):${C2} ${a_cpu_working[1]} MHz${CN}"
+			# someone actually appeared with a 16 core system, so going to stop the cpu core throttle
+			# if this had some other purpose which we can't remember we'll add it back in
+			#if [[ $i -gt 10 ]];then
+			#	break
+			#fi
 		done
 		if [[ -n $cpu_multi_clock_data ]];then
 			cpu_multi_clock_data=$( create_print_line " " "${C1}Clock Speeds:${C2}$cpu_multi_clock_data" )
@@ -4334,34 +9314,54 @@ print_cpu_data()
 		fi
 	fi
 	if [[ $B_CPU_FLAGS_FULL == 'true' ]];then
-		print_cpu_flags_full "${a_cpu_working[3]}"
+		print_cpu_flags_full "${a_cpu_working[3]}" "${a_cpu_working[6]}"
 	fi
 	eval $LOGFE
 }
 
 # takes list of all flags, split them and prints x per line
-# args: $1 - cpu flag string
+# args: $1 - cpu flag string; $2 - arm true/false
 print_cpu_flags_full()
 {
 	eval $LOGFS
-	local cpu_flags_full="$1" a_cpu_flags='' line_starter=''
-	local i=0 counter=0 max_length=18 max_length_add=18 flag='' flag_data=''
-
+	# note: sort only sorts lines, not words in a string, so convert to lines
+	local cpu_flags_full="$( echo $1 | tr " " "\n" | sort )" 
+	local a_cpu_flags='' line_starter='' temp_string=''
+	local i=0 counter=0 starter_length=15 flag='' flag_data=''
+	local line_length='' flag_feature='Flags' spacer='' flag_string=''
+	
+	if [[ $2 == 'true' ]];then
+		flag_feature='Features'
+	fi
 	# build the flag line array
 	for flag in $cpu_flags_full
 	do
-		a_cpu_flags[$counter]="${a_cpu_flags[$counter]}$flag "
-		if [[ $i -ge $max_length ]];then
+		temp_string="$flag_string$spacer$flag"
+		spacer=' '
+		# handle inner line starter
+		if [[ $counter -eq 0 ]];then
+			line_length=$(( $COLS_INNER - $starter_length ))
+		else
+			line_length=$COLS_INNER
+		fi
+		if [[ ${#temp_string} -gt $line_length ]];then
+			a_cpu_flags[$counter]=$temp_string
+			flag_string=''
+			spacer=''
 			(( counter++ ))
-			max_length=$(( $max_length + $max_length_add ))
+		else
+			flag_string=$temp_string
 		fi
-		((i++))
+		temp_string=''
 	done
+	if [[ -n $flag_string ]];then
+		a_cpu_flags[$counter]=$flag_string
+	fi
 	# then print it out
 	for (( i=0; i < ${#a_cpu_flags[@]};i++ ))
 	do
 		if [[ $i -eq 0 ]];then
-			line_starter="${C1}CPU Flags${C2} "
+			line_starter="${C1}CPU $flag_feature$SEP3${C2} "
 		else
 			line_starter=''
 		fi
@@ -4371,63 +9371,173 @@ print_cpu_flags_full()
 	eval $LOGFE
 }
 
-print_gfx_data()
+print_graphics_data()
 {
 	eval $LOGFS
-	local gfx_data='' i='' card_one='Card' root_alert=''
+	local graphics_data='' card_id='' i='' root_alert='' root_x_string='' a_graphics_working=''
+	local b_is_mesa='false' display_full_string='' card_bus_id='' card_data=''
+	local res_tty='Resolution' xorg_data='' display_vendor_string='' chip_id=''
+	local spacer='' driver='' driver_string='' driver_plural='' direct_render_string=''
+	local separator_loaded='' separator_unloaded='' separator_failed='' 
+	local loaded='' unloaded='' failed='' display_server_string=''
+	local line_starter='Graphics:'
 	local screen_resolution="$( get_graphics_res_data )"
-	local b_is_mesa='false' display_full_string=''
-	# set A_GFX_CARD_DATA
-	get_graphics_card_data
-	# set A_X_DATA
-	get_graphics_x_data
-	local x_vendor=${A_X_DATA[0]}
-	local x_version=${A_X_DATA[1]}
+	
+	# set A_DISPLAY_SERVER_DATA
+	get_graphics_display_server_data
+	local display_vendor=${A_DISPLAY_SERVER_DATA[0]}
+	local display_version=${A_DISPLAY_SERVER_DATA[1]}
 	# set A_GLX_DATA
 	get_graphics_glx_data
 	local glx_renderer="${A_GLX_DATA[0]}"
 	local glx_version="${A_GLX_DATA[1]}"
 	# this can contain a long No case debugging message, so it's being sliced off
 	# note: using grep -ioE '(No|Yes)' <<< ${A_GLX_DATA[2]} did not work in Arch, no idea why
-	local glx_direct_render=$( gawk '{
-		print $1
-	}'  <<< "${A_GLX_DATA[2]}" )
+	local glx_direct_render=$( gawk '{print $1}' <<< "${A_GLX_DATA[2]}" )
+
+	# set A_GRAPHICS_CARD_DATA
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		if [[ $B_PCICONF_SET == 'false' ]];then
+			get_pciconf_data
+		fi
+		get_pciconf_card_data 'display'
+	else
+		get_graphics_card_data
+	fi
+	# set A_GRAPHIC_DRIVERS
+	get_graphics_driver
+	
+	if [[ ${#A_GRAPHIC_DRIVERS[@]} -eq 0 ]];then
+		driver=' N/A'
+	else
+		for (( i=0; i < ${#A_GRAPHIC_DRIVERS[@]}; i++ ))
+		do
+			IFS=","
+			a_graphics_working=( ${A_GRAPHIC_DRIVERS[i]} )
+			IFS="$ORIGINAL_IFS"
+			case ${a_graphics_working[1]} in
+				loaded)
+					loaded="$loaded$separator_loaded${a_graphics_working[0]}"
+					separator_loaded=','
+					;;
+				unloaded)
+					unloaded="$unloaded$separator_unloaded${a_graphics_working[0]}"
+					separator_unloaded=','
+					;;
+				failed)
+					failed="$failed$separator_failed${a_graphics_working[0]}"
+					separator_failed=','
+					;;		
+			esac
+		done
+	fi
+	if [[ -n $loaded ]];then
+		driver="${driver} $loaded"
+	fi
+	if [[ -n $unloaded ]];then
+		driver="${driver} (unloaded: $unloaded)"
+	fi
+	if [[ -n $failed ]];then
+		driver="${driver} ${RED}FAILED:${C2} $failed"
+	fi
+	# sometimes for some reason there is no driver found but the array is started
+	if [[ -z $driver ]];then
+		driver=' N/A'
+	fi
+
+	if [[ ${#A_GRAPHIC_DRIVERS[@]} -gt 1 ]];then
+		driver_plural='s'
+	fi
+	driver_string="${C1}driver$driver_plural$SEP3${C2}$driver "
+	
 	# some basic error handling:
 	if [[ -z $screen_resolution ]];then
 		screen_resolution='N/A'
 	fi
-
-	if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
-		if [[ -z $x_vendor || -z $x_version ]];then
-			x_vendor='X-Vendor: N/A'
-		fi
-		display_full_string="${C1}$x_vendor${C2} $x_version ${C1}Res:${C2} ${screen_resolution} "
+	if [[ -z $display_vendor || -z $display_version ]];then
+		display_vendor_string="N/A"
 	else
-		if [[ $B_X_RUNNING == 'true' && $B_ROOT == 'true' ]];then
-			root_alert="${C1}Gfx Data:${C2} N/A for root user"
+		display_vendor_string="$display_vendor $display_version"
+	fi
+	display_server_string="${C1}Display Server${SEP3}${C2} $display_vendor_string "
+
+	if [[ $B_ROOT == 'true' ]];then
+		root_x_string='for root '
+		if [[ $B_RUNNING_IN_SHELL == 'true' || $B_CONSOLE_IRC == 'true' ]];then
+			res_tty='tty size'
 		fi
-		display_full_string="${C1}tty res:${C2} ${screen_resolution} $root_alert"
+	fi
+	if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
+		root_x_string="${root_x_string}out of X"
+		res_tty='tty size'
+	fi
+	
+	if [[ -n $root_x_string ]];then
+		root_x_string="${C1}Advanced Data:${C2} N/A $root_x_string"
 	fi
 
-	if [[ ${#A_GFX_CARD_DATA[@]} -gt 1 ]];then
-		i=1
-		while [[ -n ${A_GFX_CARD_DATA[i]} && $i -le 3 ]]
+	display_full_string="$display_server_string$driver_string${C1}${res_tty}$SEP3${C2} ${screen_resolution} $root_x_string"
+
+	if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 0 ]];then
+		for (( i=0; i < ${#A_GRAPHICS_CARD_DATA[@]}; i++ ))
 		do
-			gfx_data=" ${C1}Card-$(($i+1))${C2} ${A_GFX_CARD_DATA[i]}"
-			((i++))
+			IFS=","
+			a_graphics_working=( ${A_GRAPHICS_CARD_DATA[i]} )
+			IFS="$ORIGINAL_IFS"
+			card_bus_id=''
+			card_data=${a_graphics_working[0]}
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+				if [[ -n ${a_graphics_working[1]} ]];then
+					card_bus_id=" ${C1}bus-ID$SEP3${C2} ${a_graphics_working[1]}"
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						if [[ $BSD_TYPE != 'bsd' ]];then
+							chip_id=$( get_lspci_chip_id "${a_graphics_working[1]}" )
+						else
+							chip_id=${a_graphics_working[2]}
+						fi
+					fi
+				else
+					card_bus_id=" ${C1}bus-ID$SEP3${C2} N/A"
+				fi
+			fi
+			if [[ -n $chip_id ]];then
+				chip_id=" ${C1}chip-ID$SEP3${C2} $chip_id"
+			fi
+			if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then
+				card_id="Card-$(($i+1)):"
+			else
+				card_id='Card:'
+			fi
+			graphics_data="${C1}$card_id${C2} $card_data$card_bus_id$chip_id "
+			if [[ ${#A_GRAPHICS_CARD_DATA[@]} -gt 1 ]];then
+				graphics_data=$( create_print_line "$line_starter" "${graphics_data}" )
+				print_screen_output "$graphics_data"
+				line_starter=' '
+				graphics_data=''
+			fi
 		done
-		card_one='Card-1'
+	# handle cases where card detection fails, like in PS3, where lspci gives no output, or headless boxes..
+	else
+		graphics_data="${C1}Card:${C2} Failed to Detect Video Card! "
 	fi
-	gfx_data=$( create_print_line "Graphics:" "${C1}$card_one${C2} ${A_GFX_CARD_DATA[0]}${gfx_data} $display_full_string" )
-	print_screen_output "$gfx_data"
-
-# 	if [[ -z $glx_renderer || -z $glx_version ]];then
-# 		b_is_mesa='true'
-# 	fi
+	if [[ -n $graphics_data && $( calculate_line_length "${graphics_data}$display_full_string" ) -lt $COLS_INNER ]];then
+		graphics_data=$( create_print_line "$line_starter" "${graphics_data}$display_full_string" )
+	else
+		if [[ -n $graphics_data ]];then
+			graphics_data=$( create_print_line "$line_starter" "$graphics_data" )
+			print_screen_output "$graphics_data"
+			line_starter=' '
+		fi
+		graphics_data=$( create_print_line "$line_starter" "$display_full_string" )
+	fi
+	print_screen_output "$graphics_data"
+	# if [[ -z $glx_renderer || -z $glx_version ]];then
+	# 	b_is_mesa='true'
+	# fi
 
-	## note: if glx render or version have no content, then mesa is true
-	# if [[ $B_X_RUNNING == 'true' ]] && [[ $b_is_mesa != 'true' ]];then
-	if [[ $B_X_RUNNING == 'true' && $B_ROOT != 'true' ]];then
+	## note: if glx render or display_version have no content, then mesa is true
+	# if [[ $B_SHOW_DISPLAY_DATA == 'true' ]] && [[ $b_is_mesa != 'true' ]];then
+	if [[ $B_SHOW_DISPLAY_DATA == 'true' && $B_ROOT != 'true' ]];then
 		if [[ -z $glx_renderer ]];then
 			glx_renderer='N/A'
 		fi
@@ -4437,11 +9547,13 @@ print_gfx_data()
 		if [[ -z $glx_direct_render ]];then
 			glx_direct_render='N/A'
 		fi
-		gfx_data=$( create_print_line " " "${C1}GLX Renderer${C2} ${glx_renderer} ${C1}GLX Version${C2} ${glx_version}${CN}" )
 		if [[ $B_HANDLE_CORRUPT_DATA == 'true' || $B_EXTRA_DATA == 'true' ]];then
-			gfx_data="$gfx_data ${C1}Direct Rendering${C2} ${glx_direct_render}${CN}"
+			direct_render_string=" ${C1}Direct Rendering$SEP3${C2} ${glx_direct_render}${CN}"
 		fi
-		print_screen_output "$gfx_data"
+		graphics_data="${C1}GLX Renderer$SEP3${C2} ${glx_renderer} ${C1}GLX Version$SEP3${C2} ${glx_version}${CN}$direct_render_string"
+		graphics_data=$( create_print_line " " "$graphics_data" )
+		
+		print_screen_output "$graphics_data"
 	fi
 	eval $LOGFE
 }
@@ -4450,7 +9562,9 @@ print_hard_disk_data()
 {
 	eval $LOGFS
 	local hdd_data='' hdd_data_2='' a_hdd_working='' hdd_temp_data='' hdd_string=''
+	local hdd_serial=''
 	local dev_data='' size_data='' hdd_model='' usb_data='' hdd_name='' divisor=5
+	local Line_Starter='Drives:' # inherited by print_optical_drives
 
 	# load A_HDD_DATA
 	get_hdd_data_basic
@@ -4460,10 +9574,12 @@ print_hard_disk_data()
 	IFS=","
 	local a_hdd_basic_working=( ${A_HDD_DATA[$a_hdd_data_count]} )
 	IFS="$ORIGINAL_IFS"
-	local hdd_capacity=${a_hdd_basic_working[0]}
+	local hdd_capacity="${a_hdd_basic_working[0]}"
 	local hdd_used=${a_hdd_basic_working[1]}
+	local bsd_unsupported='Hard drive data not yet supported for BSD systems.'
+	local hdd_name_temp=''
 
-	if [[ $VERBOSITY_LEVEL -ge 3 || $B_SHOW_DISK == 'true' ]];then
+	if [[ $B_SHOW_BASIC_DISK == 'true' || $B_SHOW_DISK == 'true' ]];then
 	## note: the output part of this should be in the print hdd data function, not here
 		get_hard_drive_data_advanced
 		for (( i=0; i < ${#A_HDD_DATA[@]} - 1; i++ ))
@@ -4472,53 +9588,95 @@ print_hard_disk_data()
 			IFS=","
 			a_hdd_working=( ${A_HDD_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
-			if [[ $B_SHOW_DISK == 'true' || $VERBOSITY_LEVEL -ge 5 ]];then
+			if [[ $B_SHOW_DISK == 'true' ]];then
 				if [[ -n ${a_hdd_working[3]} ]];then
 					usb_data="${a_hdd_working[3]} "
 				else
 					usb_data=''
 				fi
 				dev_data="/dev/${a_hdd_working[0]} "
-				size_data=" ${a_hdd_working[1]}"
+				size_data=" ${C1}size$SEP3${C2} ${a_hdd_working[1]}"
 				if [[ $B_EXTRA_DATA == 'true' && -n $dev_data ]];then
 					hdd_temp_data=$( get_hdd_temp_data "$dev_data" )
 					# error handling is done in get data function
 					if [[ -n $hdd_temp_data ]];then
-						hdd_temp_data=" ${hdd_temp_data}C"
+						hdd_temp_data=" ${C1}temp$SEP3${C2} ${hdd_temp_data}C"
 					else
 						hdd_temp_data=''
 					fi
 				fi
-				divisor=2 # for modulus line print out, either 2 items for full, or default for short
+				if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+					hdd_serial=$( get_hdd_serial_number "${a_hdd_working[0]}" )
+					if [[ -z $hdd_serial ]];then
+						hdd_serial='N/A'
+					fi
+					hdd_serial=" ${C1}serial$SEP3${C2} $hdd_serial"
+					divisor=1 # print every line
+				else
+					divisor=2 # for modulus line print out, either 2 items for full, or default for short
+				fi
+				dev_data="${C1}id$SEP3${C2} /dev/${a_hdd_working[0]} "
+			fi
+			if [[ -n ${a_hdd_working[2]} ]];then
+				hdd_name_temp=${a_hdd_working[2]}
+			else
+				hdd_name_temp='N/A'
 			fi
-			hdd_name="${a_hdd_working[2]}"
-			hdd_string="$usb_data$dev_data$hdd_name$size_data$hdd_temp_data"
+			hdd_name="${C1}model$SEP3${C2} $hdd_name_temp"
+			hdd_string="$usb_data$dev_data$hdd_name$size_data$hdd_serial$hdd_temp_data"
 			hdd_model="${hdd_model}${C1}$(($i+1)):${C2} $hdd_string "
 			# printing line one, then new lines according to $divisor setting, and after, if leftovers, print that line.
 			case $i in 
 				0)
-					hdd_data=$( create_print_line "Disks:" "${C1}HDD${C2} ${C1}Total Size:${C2} ${hdd_capacity} (${hdd_used}) ${hdd_model}" )
-					print_screen_output "$hdd_data"
-					hdd_model=''
+					if [[ $divisor -eq 1 ]];then
+						hdd_data=$( create_print_line "$Line_Starter" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})" )
+						print_screen_output "$hdd_data"
+						Line_Starter=' '
+						hdd_data=$( create_print_line "$Line_Starter" "${hdd_model}" )
+						print_screen_output "$hdd_data"
+						hdd_model=''
+					else
+						hdd_data=$( create_print_line "$Line_Starter" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used}) ${hdd_model}" )
+						print_screen_output "$hdd_data"
+						hdd_model=''
+						Line_Starter=' '
+					fi
 					;;
 				*)
 					# using modulus here, if divisible by $divisor, print line, otherwise skip
 					if [[ $(( $i % $divisor )) -eq 0 ]];then
-						hdd_data=$( create_print_line " " "${hdd_model}${CN}" )
+						hdd_data=$( create_print_line "$Line_Starter" "${hdd_model}${CN}" )
 						print_screen_output "$hdd_data"
 						hdd_model=''
+						Line_Starter=' '
 					fi
 					;;
 			esac
 		done
 		# then print any leftover items
 		if [[ -n $hdd_model ]];then
-			hdd_data=$( create_print_line " " "${hdd_model}${CN}" )
+			hdd_data=$( create_print_line "$Line_Starter" "${hdd_model}${CN}" )
+			print_screen_output "$hdd_data"
+		fi
+		# temporary message to indicate not yet supported
+		if [[ $BSD_TYPE == 'bsd' ]];then
+			hdd_data=$bsd_unsupported
+			hdd_data=$( create_print_line "$Line_Starter" "$hdd_data${CN}" )
 			print_screen_output "$hdd_data"
+			Line_Starter=' '
 		fi
 	else
-		hdd_data=$( create_print_line "Disks:" "${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})${CN}" )
+		# temporary message to indicate not yet supported
+		hdd_data="${C1}HDD Total Size:${C2} ${hdd_capacity} (${hdd_used})"
+		if [[ $BSD_TYPE == 'bsd' ]];then
+			hdd_data=$bsd_unsupported
+		fi
+		hdd_data=$( create_print_line "$Line_Starter" "$hdd_data${CN}" )
 		print_screen_output "$hdd_data"
+		Line_Starter=' '
+	fi
+	if [[ $B_SHOW_FULL_OPTICAL == 'true' || $B_SHOW_BASIC_OPTICAL == 'true' ]];then
+		print_optical_drive_data
 	fi
 
 	eval $LOGFE
@@ -4528,33 +9686,306 @@ print_info_data()
 {
 	eval $LOGFS
 
-	local info_data=''
-	local runlvl=''
+	local info_data='' line_starter='Info:' runlvl_default='' runlvl='' runlvl_title='runlevel' 
+	local init_data='' init_type='' init_version='' rc_type='' rc_version=''
+	local client_data='' shell_data='' shell_parent='' tty_session=''
 	local memory="$( get_memory_data )"
-	local processes="$(( $( ps aux | wc -l ) - 1 ))"
+	local processes=$(( $( wc -l <<< "$Ps_aux_Data" ) - 1 ))
 	local up_time="$( get_uptime )"
+	local patch_version_number=$( get_patch_version_string )
+	local gcc_string='' gcc_installed='' gcc_others='' closing_data='' 
+	
+	if [[ -z $memory ]];then
+		memory='N/A'
+	fi
+	
+	if [[ $B_EXTRA_DATA == 'true' ]];then
+		get_gcc_system_version
+		if [[ ${#A_GCC_VERSIONS[@]} -gt 0 ]];then
+			if [[ -n ${A_GCC_VERSIONS[0]} ]];then
+				gcc_installed=${A_GCC_VERSIONS[0]}
+			else
+				gcc_installed='N/A'
+			fi
+			if [[ $B_EXTRA_EXTRA_DATA == 'true' && -n ${A_GCC_VERSIONS[1]} ]];then
+				gcc_others=" ${C1}alt$SEP3${C2} $( tr ',' '/' <<< ${A_GCC_VERSIONS[1]} )"
+			fi
+			gcc_installed="${C1}Gcc sys$SEP3${C2} $gcc_installed$gcc_others "
+		fi
+	fi
+	if [[  $B_RUNNING_IN_SHELL == 'true' ]];then
+		shell_data=$( get_shell_data )
+		if [[ -n $shell_data ]];then
+			# note, if you start this in tty, it will give 'login' as the parent, which we don't want.
+			if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+				if [[ $B_RUNNING_IN_DISPLAY != 'true' ]];then
+					shell_parent=$( get_tty_number )
+					shell_parent="tty $shell_parent"
+				else
+					shell_parent=$( get_shell_parent )
+				fi
+				if [[ $shell_parent == 'login' ]];then
+					shell_parent=''
+				elif [[ -n $shell_parent ]];then
+					shell_parent=" running in $shell_parent"
+				fi
+			fi
+			IRC_CLIENT="$IRC_CLIENT ($shell_data$shell_parent)"
+		fi
+	fi
 
 	# Some code could look superfluous but BitchX doesn't like lines not ending in a newline. F*&k that bitch!
-	# long_last=$( echo -ne "${C1}Processes${C2} ${processes}${CN} | ${C1}Uptime${C2} ${up_time}${CN} | ${C1}Memory${C2} ${MEM}${CN}" )
-	info_data=$( create_print_line "Info:" "${C1}Processes${C2} ${processes} ${C1}Uptime${C2} ${up_time} ${C1}Memory${C2} ${memory}${CN}" )
+	# long_last=$( echo -ne "${C1}Processes$SEP3${C2} ${processes}${CN} | ${C1}Uptime$SEP3${C2} ${up_time}${CN} | ${C1}Memory$SEP3${C2} ${MEM}${CN}" )
+	info_data="${C1}Processes$SEP3${C2} ${processes} ${C1}Uptime$SEP3${C2} ${up_time} ${C1}Memory$SEP3${C2} ${memory}${CN} "
 
 	# this only triggers if no X data is present or if extra data switch is on
-	if [[ $B_X_RUNNING != 'true' || $B_EXTRA_DATA == 'true' ]];then
-		runlvl="$( get_runlevel_data )"
+	if [[ $B_SHOW_DISPLAY_DATA != 'true' || $B_EXTRA_DATA == 'true' ]];then
+		get_init_data
+		if [[ ${A_INIT_DATA[0]} == 'systemd' && -z $( grep -E '^[0-9]$' <<< ${A_INIT_DATA[4]} ) ]];then
+			runlvl_title='target'
+		fi
+		init_type=${A_INIT_DATA[0]}
+		if [[ -z $init_type ]];then
+			init_type='N/A'
+		fi
+		
+		if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+			init_version=${A_INIT_DATA[1]}
+			if [[ -z $init_version ]];then
+				init_version='N/A'
+			fi
+			init_version=" ${C1}v$SEP3${C2} $init_version"
+			rc_version=${A_INIT_DATA[3]}
+			if [[ -n $rc_version ]];then
+				rc_version=" ${C1}v$SEP3${C2} $rc_version"
+			fi
+			
+			runlvl_default=${A_INIT_DATA[5]}
+		fi
+		# currently only using openrc here, otherwise show nothing
+		rc_type=${A_INIT_DATA[2]}
+		if [[ -n $rc_type ]];then
+			rc_type=" ${C1}rc$SEP3${C2} $rc_type$rc_version"
+		fi
+		init_type="${C1}Init$SEP3${C2} $init_type$init_version "
+		
+		runlvl=${A_INIT_DATA[4]}
 		if [[ -n $runlvl ]];then
-			info_data="${info_data} ${C1}Runlevel${C2} ${runlvl}${CN}"
+			runlvl="${C1}$runlvl_title$SEP3${C2} $runlvl "
+		fi
+		if [[ -n $runlvl_default ]];then
+			runlvl_default="${C1}default$SEP3${C2} $runlvl_default "
 		fi
+		init_data="$init_type$rc_type$runlvl$runlvl_default"
 	fi
-
 	if [[ $SHOW_IRC -gt 0 ]];then
-		info_data="${info_data} ${C1}Client${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION}${CN}"
+		client_data="${C1}Client$SEP3${C2} ${IRC_CLIENT}${IRC_CLIENT_VERSION} "
 	fi
-	info_data="${info_data} ${C1}$SCRIPT_NAME${C2} $SCRIPT_VERSION_NUMBER${CN}"
-
+	info_data="${info_data}"
+	closing_data="$client_data${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number${CN}"
+	
+	# sometimes gcc is very long, and default runlevel can be long with systemd, so create a gcc-less line first
+	if [[ $( calculate_line_length "${info_data}${init_data}${gcc_installed}${closing_data}" ) -gt $COLS_INNER ]];then
+		info_data=${info_data}${init_data}
+		info_data=$( create_print_line "$line_starter" "$info_data" )
+		print_screen_output "$info_data"
+		init_data=''
+		info_data=''
+		# closing_data=''
+		line_starter=' '
+		#echo 1
+	fi
+	if [[ $( calculate_line_length "${info_data}${init_data}${gcc_installed}${closing_data}" ) -gt $COLS_INNER ]];then
+		info_data=${info_data}${init_data}${gcc_installed}
+		info_data=$( create_print_line "$line_starter" "$info_data" )
+		print_screen_output "$info_data"
+		info_data=''
+		gcc_installed=''
+		init_data=''
+		line_starter=' '
+		#echo 2
+	fi
+	info_data="${info_data}${init_data}${gcc_installed}${closing_data}"
+	
+	info_data=$( create_print_line "$line_starter" "$info_data" )
 	if [[ $SCHEME -gt 0 ]];then
 		info_data="${info_data} ${NORMAL}"
 	fi
 	print_screen_output "$info_data"
+	
+	eval $LOGFE
+}
+
+print_machine_data()
+{
+	eval $LOGFS
+	
+	local system_line='' mobo_line='' bios_line='' chassis_line=''
+	local mobo_vendor='' mobo_model='' mobo_version='' mobo_serial=''
+	local bios_vendor='' bios_version='' bios_date='' bios_rom=''
+	local system_vendor='' product_name='' product_version='' product_serial='' product_uuid=''
+	local chassis_vendor='' chassis_type='' chassis_version='' chassis_serial='' 
+	local b_skip_system='false' b_skip_chassis='false'
+	local sysDmiError='No /sys/class/dmi, using '
+	local sysDmiNull='No /sys/class/dmi machine data: try newer kernel, or install dmidecode'
+	# set A_MACHINE_DATA
+	get_machine_data
+	
+	if [[ -n $BSD_TYPE ]];then
+		sysDmiError=''
+		sysDmiNull='No machine data available. Is dmidecode installed?'
+	fi
+
+	IFS=','
+	## keys for machine data are:
+	# 0-sys_vendor 1-product_name 2-product_version 3-product_serial 4-product_uuid 
+	# 5-board_vendor 6-board_name 7-board_version 8-board_serial 
+	# 9-bios_vendor 10-bios_version 11-bios_date 
+	## with extra data: 
+	# 12-chassis_vendor 13-chassis_type 14-chassis_version 15-chassis_serial
+	
+	if [[ ${#A_MACHINE_DATA[@]} -gt 0 ]];then
+		# note: in some case a mobo/version will match a product name/version, do not print those
+		# but for laptops, or even falsely id'ed desktops with batteries, let's print it all if it matches
+		# there can be false id laptops if battery appears so need to make sure system is filled
+		if [[ -z ${A_MACHINE_DATA[0]} ]];then
+			b_skip_system='true'
+		else
+			if [[ $B_PORTABLE != 'true'  ]];then
+				# 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 [[ -n ${A_MACHINE_DATA[0]} && ${A_MACHINE_DATA[0]} == ${A_MACHINE_DATA[5]} ]];then
+					if [[ -n ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[2]} == ${A_MACHINE_DATA[7]} ]] || \
+					[[ -z ${A_MACHINE_DATA[2]} && ${A_MACHINE_DATA[1]} == ${A_MACHINE_DATA[6]} ]];then
+						b_skip_system='true'
+					fi
+				fi
+			fi
+		fi
+		# no point in showing chassis if system isn't there, it's very unlikely that would be correct
+		if [[ $B_EXTRA_EXTRA_DATA == 'true' && $b_skip_system != 'true' ]];then
+			if [[ -n ${A_MACHINE_DATA[7]} && ${A_MACHINE_DATA[14]} == ${A_MACHINE_DATA[7]} ]];then
+				b_skip_chassis='true'
+			fi
+			if [[ -n ${A_MACHINE_DATA[12]} && $b_skip_chassis != 'true' ]];then
+				# no need to print the vendor string again if it's the same
+				if [[ ${A_MACHINE_DATA[12]} != ${A_MACHINE_DATA[0]} ]];then
+					chassis_vendor=" ${A_MACHINE_DATA[12]}"
+				fi
+				if [[ -n ${A_MACHINE_DATA[13]} ]];then
+					chassis_type=" ${C1}type$SEP3${C2} ${A_MACHINE_DATA[13]}"
+				fi
+				if [[ -n ${A_MACHINE_DATA[14]} ]];then
+					chassis_version=" ${C1}version$SEP3${C2} ${A_MACHINE_DATA[14]}"
+				fi
+				if [[ -n ${A_MACHINE_DATA[15]} && $B_OUTPUT_FILTER != 'true' ]];then
+					chassis_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[15]}"
+				fi
+				if [[ -n "$chassis_vendor$chassis_type$chassis_version$chassis_serial" ]];then
+					chassis_line="${C1}Chassis$SEP3${C2}$chassis_vendor$chassis_type$chassis_version$chassis_serial"
+				fi
+			fi
+		fi
+		if [[ -n ${A_MACHINE_DATA[5]} ]];then
+			mobo_vendor=${A_MACHINE_DATA[5]}
+		else
+			mobo_vendor='N/A'
+		fi
+		if [[ -n ${A_MACHINE_DATA[6]} ]];then
+			mobo_model=${A_MACHINE_DATA[6]}
+		else
+			mobo_model='N/A'
+		fi
+		if [[ -n ${A_MACHINE_DATA[7]} ]];then
+			mobo_version=" ${C1}version$SEP3${C2} ${A_MACHINE_DATA[7]}"
+		fi
+		if [[ -n ${A_MACHINE_DATA[8]} && $B_OUTPUT_FILTER != 'true' ]];then
+			mobo_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[8]}"
+		fi
+		if [[ -n ${A_MACHINE_DATA[9]} ]];then
+			bios_vendor=${A_MACHINE_DATA[9]}
+		else
+			bios_vendor='N/A'
+		fi
+		if [[ -n ${A_MACHINE_DATA[10]} ]];then
+			bios_version=${A_MACHINE_DATA[10]}
+			if [[ -n ${A_MACHINE_DATA[16]} ]];then
+				bios_version="$bios_version rv ${A_MACHINE_DATA[16]}"
+			fi
+		else
+			bios_version='N/A'
+		fi
+		if [[ -n ${A_MACHINE_DATA[11]} ]];then
+			bios_date=${A_MACHINE_DATA[11]}
+		else
+			bios_date='N/A'
+		fi
+		if [[ $B_EXTRA_EXTRA_DATA == 'true' && -n ${A_MACHINE_DATA[17]} ]];then
+			bios_rom=" ${C1}rom size$SEP3${C2} ${A_MACHINE_DATA[17]}"
+		fi
+		mobo_line="${C1}Mobo$SEP3${C2} $mobo_vendor ${C1}model$SEP3${C2} $mobo_model$mobo_version$mobo_serial"
+		bios_line="${C1}Bios$SEP3${C2} $bios_vendor ${C1}version$SEP3${C2} $bios_version ${C1}date$SEP3${C2} $bios_date$bios_rom"
+		if [[ $( calculate_line_length "$mobo_line$bios_line" ) -lt $COLS_INNER ]];then
+			mobo_line="$mobo_line $bios_line"
+			bios_line=''
+		fi
+		if [[ $b_skip_system == 'true' ]];then
+			system_line=$mobo_line
+			mobo_line=''
+		else
+			# this has already been tested for above so we know it's not null
+			system_vendor=${A_MACHINE_DATA[0]}
+			if [[ $B_PORTABLE == 'true' ]];then
+				system_vendor="$system_vendor (portable)"
+			fi
+ 			if [[ -n ${A_MACHINE_DATA[1]} ]];then
+				product_name=${A_MACHINE_DATA[1]}
+			else
+				product_name='N/A'
+			fi
+			if [[ -n ${A_MACHINE_DATA[2]} ]];then
+				product_version=" ${C1}version$SEP3${C2} ${A_MACHINE_DATA[2]}"
+			fi
+			if [[ -n ${A_MACHINE_DATA[3]} && $B_OUTPUT_FILTER != 'true' ]];then
+				product_serial=" ${C1}serial$SEP3${C2} ${A_MACHINE_DATA[3]} "
+			fi
+			system_line="${C1}System$SEP3${C2} $system_vendor ${C1}product$SEP3${C2} $product_name$product_version$product_serial"
+			if [[ -n $chassis_line && $( calculate_line_length "$system_line$chassis_line" ) -lt $COLS_INNER ]];then
+				system_line="$system_line $chassis_line"
+				chassis_line=''
+			fi
+		fi
+		IFS="$ORIGINAL_IFS"
+	else
+		system_line="${C2}$sysDmiNull${CN}"
+	fi
+	# patch to dump all of above if dmidecode was data source and non root user
+	if [[ ${A_MACHINE_DATA[0]} == 'dmidecode-non-root-user' || ${A_MACHINE_DATA[0]} == 'dmidecode-no-smbios-dmi-data' ]];then
+		if [[ ${A_MACHINE_DATA[0]} == 'dmidecode-non-root-user' ]];then
+			system_line="${C2}${sysDmiError}dmidecode: you must be root to run dmidecode${CN}"
+		elif [[ ${A_MACHINE_DATA[0]} == 'dmidecode-no-smbios-dmi-data' ]];then
+			system_line="${C2}${sysDmiError}dmidecode: no machine data available${CN}"
+		fi
+		mobo_line=''
+		bios_line=''
+		chassis_line=''
+	fi
+	system_line=$( create_print_line "Machine:" "$system_line" )
+	print_screen_output "$system_line"
+	if [[ -n $mobo_line ]];then
+		mobo_line=$( create_print_line " " "$mobo_line" )
+		print_screen_output "$mobo_line"
+	fi
+	if [[ -n $bios_line ]];then
+		bios_line=$( create_print_line " " "$bios_line" )
+		print_screen_output "$bios_line"
+	fi
+	if [[ -n $chassis_line ]];then
+		chassis_line=$( create_print_line " " "$chassis_line" )
+		print_screen_output "$chassis_line"
+	fi
+	
 	eval $LOGFE
 }
 
@@ -4588,7 +10019,7 @@ print_module_version()
 	done
 
 	if [[ -n $module_versions ]];then
-		echo " ${C1}v:${C2}$module_versions"
+		echo " ${C1}ver$SEP3${C2}$module_versions"
 	fi
 	eval $LOGFE
 }
@@ -4596,75 +10027,156 @@ print_module_version()
 print_networking_data()
 {
 	eval $LOGFS
-	local i='' card_one='Card-1' network_data='' a_network_working='' port_data='' driver_data=''
-	local card_string='' port_plural='' module_version='' pci_bus_id=''
+	local i='' card_id='' network_data='' a_network_working='' port_data='' driver_data=''
+	local card_string='' port_plural='' module_version='' pci_bus_id='' bus_usb_text=''
+	local bus_usb_id='' line_starter='Network:' card_string='' card_data='' chip_id=''
+	local driver=''
 	# set A_NETWORK_DATA
-	get_networking_data
-
-	IFS=","
-	a_network_working=(${A_NETWORK_DATA[0]})
-	IFS="$ORIGINAL_IFS"
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		if [[ $B_PCICONF_SET == 'false' ]];then
+			get_pciconf_data
+		fi
+		get_pciconf_card_data 'network'
+	else
+		get_networking_data
+	fi
 
 	# will never be null because null is handled in get_network_data, but in case we change
 	# that leaving this test in place.
 	if [[ -n ${A_NETWORK_DATA[@]} ]];then
-		if [[ ${#A_NETWORK_DATA[@]} -le 1 ]];then
-			card_one='Card'
-		fi
-		if [[ -n ${a_network_working[1]} && $B_EXTRA_DATA == 'true' ]];then
-			module_version=$( print_module_version "${a_network_working[1]}" )
-		fi
-		if [[ -n ${a_network_working[1]} ]];then
-			driver_data=" ${C1}driver${C2} ${a_network_working[1]}$module_version"
-		fi
-		if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
-			if [[ $( wc -w <<< ${a_network_working[2]} ) -gt 1 ]];then
-				port_plural='s'
-			fi
-			port_data=" ${C1}at port$port_plural${C2} ${a_network_working[2]}"
-		fi
-		if [[ -n ${a_network_working[4]} && $B_EXTRA_DATA == 'true' ]];then
-			pci_bus_id=" ${C1}BusID:${C2} ${a_network_working[4]}"
-		fi
-		
-		card_string=''
-		network_data="${C1}$card_one${C2} ${a_network_working[0]}$driver_data$port_data$pci_bus_id"
-		network_data=$( create_print_line "Network:" "$network_data" )
-		print_screen_output "$network_data"
-		i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
-		while [[ -n ${A_NETWORK_DATA[++i]} ]]
+		for (( i=0; i < ${#A_NETWORK_DATA[@]}; i++ ))
 		do
 			IFS=","
 			a_network_working=( ${A_NETWORK_DATA[i]} )
 			IFS="$ORIGINAL_IFS"
-			port_data=''
+			bus_usb_id=''
+			bus_usb_text=''
+			card_data=''
+			card_string=''
 			driver_data=''
-			port_plural=''
 			module_version=''
+			network_data=''
 			pci_bus_id=''
-			if [[ -n ${a_network_working[1]} && $B_EXTRA_DATA == 'true' ]];then
+			port_data=''
+			port_plural=''
+			card_id=''
+			chip_id=''
+
+			if [[ ${#A_NETWORK_DATA[@]} -gt 1 ]];then
+				chip_id="-$(( $i + 1 ))"
+			fi
+			if [[ -n ${a_network_working[1]} && $B_EXTRA_DATA == 'true' && $BSD_TYPE != 'bsd' ]];then
 				module_version=$( print_module_version "${a_network_working[1]}" )
 			fi
 			if [[ -n ${a_network_working[1]} ]];then
-				driver_data=" ${C1}driver${C2} ${a_network_working[1]}$module_version"
+				# note: linux drivers can have numbers, like tg3
+				if [[ $BSD_TYPE == 'bsd' ]];then
+					driver=$( sed 's/[0-9]*$//' <<< ${a_network_working[1]} )
+				else
+					driver=${a_network_working[1]}
+				fi
+				driver_data="${C1}driver$SEP3${C2} ${driver}$module_version "
 			fi
 			if [[ -n ${a_network_working[2]} && $B_EXTRA_DATA == 'true' ]];then
 				if [[ $( wc -w <<< ${a_network_working[2]} ) -gt 1 ]];then
 					port_plural='s'
 				fi
-				port_data=" ${C1}at port$port_plural${C2} ${a_network_working[2]}"
+				port_data="${C1}port$port_plural$SEP3${C2} ${a_network_working[2]} "
 			fi
 			if [[ -n ${a_network_working[4]} && $B_EXTRA_DATA == 'true' ]];then
-				pci_bus_id=" ${C1}BusID:${C2} ${a_network_working[4]}"
+				if [[ -z $( grep '^usb-' <<< ${a_network_working[4]} ) ]];then
+					bus_usb_text='bus-ID'
+					bus_usb_id=${a_network_working[4]}
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						if [[ $BSD_TYPE != 'bsd' ]];then
+							chip_id=$( get_lspci_chip_id "${a_network_working[4]}" )
+						else
+							chip_id=${a_network_working[10]}
+						fi
+					fi
+				else
+					bus_usb_text='usb-ID'
+					bus_usb_id=$( cut -d '-' -f '2-4' <<< ${a_network_working[4]} )
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						chip_id=${a_network_working[10]}
+					fi
+				fi
+				pci_bus_id="${C1}$bus_usb_text$SEP3${C2} $bus_usb_id"
+				if [[ -n $chip_id ]];then
+					chip_id=" ${C1}chip-ID$SEP3${C2} $chip_id"
+				fi
+			fi
+			card_string="${C1}Card$card_id:${C2} ${a_network_working[0]} "
+			card_data="$driver_data$port_data$pci_bus_id$chip_id"
+			if [[ $( calculate_line_length "$card_string$card_data" ) -gt $COLS_INNER ]];then
+				network_data=$( create_print_line "$line_starter" "$card_string" )
+				line_starter=' '
+				card_string=''
+				print_screen_output "$network_data"
+			fi
+			network_data=$( create_print_line "$line_starter" "$card_string$card_data" )
+			line_starter=' '
+			print_screen_output "$network_data"
+			if [[ $B_SHOW_ADVANCED_NETWORK == 'true' ]];then
+				print_network_advanced_data
+			fi
+		done
+	else
+		network_data="${C1}Card:${C2} Failed to Detect Network Card! "
+		network_data=$( create_print_line "$line_starter" "$network_data" )
+		print_screen_output "$network_data"
+	fi
+	if [[ $B_SHOW_IP == 'true' ]];then
+		print_networking_ip_data
+	fi
+	eval $LOGFE
+}
+
+print_network_advanced_data()
+{
+	eval $LOGFS
+	local network_data='' if_id='N/A' duplex='N/A' mac_id='N/A' speed='N/A' oper_state='N/A'
+	local b_is_wifi='false' speed_string='' duplex_string=''
+	
+		# first check if it's a known wifi id'ed card, if so, no print of duplex/speed
+	if [[ -n $( grep -Esi '(wireless|wifi|wi-fi|wlan|802\.11|centrino)' <<< ${a_network_working[0]} ) ]];then
+		b_is_wifi='true'
+	fi
+	if [[ -n ${a_network_working[5]} ]];then
+		if_id=${a_network_working[5]}
+	fi
+	if [[ -n ${a_network_working[6]} ]];then
+		oper_state=${a_network_working[6]}
+	fi
+	# no print out for wifi since it doesn't have duplex/speed data availabe
+	# note that some cards show 'unknown' for state, so only testing explicitly
+	# for 'down' string in that to skip showing speed/duplex
+	if [[ $b_is_wifi != 'true' && $oper_state != 'down' ]];then
+		if [[ -n ${a_network_working[7]} ]];then
+			# make sure the value is strictly numeric before appending Mbps
+			if [[ -n $( grep -E '^[0-9\.,]+$' <<< "${a_network_working[7]}" ) ]];then
+				speed="${a_network_working[7]} Mbps"
+			else
+				speed=${a_network_working[7]}
 			fi
-			network_data="${C1}Card-$(( $i + 1 ))${C2} ${a_network_working[0]}$driver_data$port_data$pci_bus_id"
-			network_data=$( create_print_line " " "$network_data" )
-			print_screen_output "$network_data"
-		done
+		fi
+		speed_string="${C1}speed$SEP3${C2} $speed "
+		if [[ -n ${a_network_working[8]} ]];then
+			duplex=${a_network_working[8]}
+		fi
+		duplex_string="${C1}duplex$SEP3${C2} $duplex "
 	fi
-	if [[ $B_SHOW_IP == 'true' ]];then
-		print_networking_ip_data
+	if [[ -n ${a_network_working[9]} ]];then
+		if [[ $B_OUTPUT_FILTER == 'true' ]];then
+			mac_id=$FILTER_STRING
+		else
+			mac_id=${a_network_working[9]}
+		fi
 	fi
+	network_data="${C1}IF:${C2} $if_id ${C1}state$SEP3${C2} $oper_state $speed_string$duplex_string${C1}mac$SEP3${C2} $mac_id"
+	network_data=$( create_print_line " " "$network_data" )
+	print_screen_output "$network_data"
+	
 	eval $LOGFE
 }
 
@@ -4672,38 +10184,222 @@ print_networking_ip_data()
 {
 	eval $LOGFS
 	local ip=$( get_networking_wan_ip_data )
-	local ip_data='' a_interfaces_working='' interfaces='' interfaces_2='' i=''
+	local wan_ip_data='' a_interfaces_working='' interfaces='' i=''
+	local if_id='' if_ip='' if_ipv6='' if_ipv6_string='' full_string='' if_string=''
+	local if_id_string='' if_ip_string=''
+	local line_max=$(( $COLS_INNER - 40 ))
 
 	# set A_INTERFACES_DATA
 	get_networking_local_ip_data
 	# first print output for wan ip line. Null is handled in the get function
-	ip_data=$( create_print_line " " "${C1}Wan IP:${C2} $ip" )
-
+	if [[ -z $ip ]];then
+		ip='N/A'
+	else
+		if [[ $B_OUTPUT_FILTER == 'true' ]];then
+			ip=$FILTER_STRING
+		fi
+	fi
+	wan_ip_data="${C1}WAN IP:${C2} $ip "
 	# then create the list of local interface/ip
-	interfaces=" ${C1}Interface:${C2}"
 	i=0 ## loop starts with 1 by auto-increment so it only shows cards > 1
 	while [[ -n ${A_INTERFACES_DATA[i]} ]]
 	do
 		IFS=","
 		a_interfaces_working=(${A_INTERFACES_DATA[i]})
 		IFS="$ORIGINAL_IFS"
-		if [[ $i -lt 3 ]];then
-			if [[ -n ${a_interfaces_working[0]} ]];then
-				interfaces="$interfaces ${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]}"
+		if_id='N/A'
+		if_ip='N/A'
+		if_ipv6='N/A'
+		if_ipv6_string=''
+		if [[ -z $( grep '^Interface' <<< ${a_interfaces_working[0]} ) ]];then
+			if [[ -n ${a_interfaces_working[1]} ]];then
+				if [[ $B_OUTPUT_FILTER == 'true' ]];then
+					if_ip=$FILTER_STRING
+				else
+					if_ip=${a_interfaces_working[1]}
+				fi
 			fi
-		else
-			if [[ -n ${a_interfaces_working[0]} ]];then
-				# space on end here for lining up with line starter
-				interfaces_2="$interfaces_2${C1}${a_interfaces_working[0]}${C2} ${a_interfaces_working[1]} "
+			if_ip_string=" ${C1}ip$SEP3${C2} $if_ip"
+			if [[ $B_EXTRA_DATA == 'true' ]];then
+				if [[ -n ${a_interfaces_working[3]} ]];then
+					if [[ $B_OUTPUT_FILTER == 'true' ]];then
+						if_ipv6=$FILTER_STRING
+					else
+						if_ipv6=${a_interfaces_working[3]}
+					fi
+				fi
+				if_ipv6_string=" ${C1}ip-v6$SEP3${C2} $if_ipv6"
 			fi
 		fi
+		if [[ -n ${a_interfaces_working[0]} ]];then
+			if_id=${a_interfaces_working[0]}
+		fi
+		if_string="$wan_ip_data$if_string${C1}IF:${C2} $if_id$if_ip_string$if_ipv6_string "
+		wan_ip_data=''
+		if [[ $( calculate_line_length "$if_string" ) -gt $line_max ]];then
+			full_string=$( create_print_line " " "$if_string" )
+			print_screen_output "$full_string"
+			if_string=''
+		fi
 		((i++))
 	done
-	print_screen_output "$ip_data$interfaces"
-	# then wrap it if needed
-	if [[ -n $interfaces_2 ]];then
-		interfaces_2=$( create_print_line " " "$interfaces_2" )
-		print_screen_output "$interfaces_2"
+	
+	# then print out anything not printed already
+	if [[ -n $if_string ]];then
+		full_string=$( create_print_line " " "$if_string" )
+		print_screen_output "$full_string"
+	fi
+	eval $LOGFE
+}
+
+print_optical_drive_data()
+{
+	eval $LOGFS
+	local a_drives='' drive_data='' counter='' 
+	local drive_id='' drive_links='' vendor='' speed='' multisession='' mcn='' audio=''
+	local dvd='' state='' rw_support='' rev='' separator='' drive_string=''
+	get_optical_drive_data
+	# 0 - true dev path, ie, sr0, hdc
+	# 1 - dev links to true path
+	# 2 - device vendor - for hdx drives, vendor model are one string from proc
+	# 3 - device model
+	# 4 - device rev version
+	if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -gt 0 ]];then
+		for (( i=0; i < ${#A_OPTICAL_DRIVE_DATA[@]}; i++ ))
+		do
+			IFS=","
+			a_drives=(${A_OPTICAL_DRIVE_DATA[i]})
+			IFS="$ORIGINAL_IFS"
+			audio=''
+			drive_data=''
+			drive_id=''
+			drive_links=''
+			dvd='' 
+			mcn='' 
+			multisession='' 
+			rev='' 
+			rw_support='' 
+			separator=''
+			speed='' 
+			state='' 
+			vendor=''
+			if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -eq 1 && -z ${a_drives[0]} && -z ${a_drives[1]} ]];then
+				drive_string="No optical drives detected."
+				B_SHOW_FULL_OPTICAL='false'
+			else
+				if [[ ${#A_OPTICAL_DRIVE_DATA[@]} -gt 1 ]];then
+					counter="-$(( i + 1 ))"
+				fi
+				if [[ -z ${a_drives[0]} ]];then
+					drive_id='N/A'
+				else
+					drive_id="/dev/${a_drives[0]}"
+				fi
+				drive_links=$( sed 's/~/,/g' <<< ${a_drives[1]} )
+				if [[ -z $drive_links ]];then
+					drive_links='N/A'
+				fi
+				if [[ -n ${a_drives[2]} ]];then
+					vendor=${a_drives[2]}
+					if [[ -n ${a_drives[3]} ]];then
+						vendor="$vendor ${a_drives[3]}"
+					fi
+				fi
+				if [[ -z $vendor ]];then
+					if [[ -n ${a_drives[3]} ]];then
+						vendor=${a_drives[3]}
+					else
+						vendor='N/A'
+					fi
+				fi
+				if [[ $B_EXTRA_DATA == 'true' ]];then
+					if [[ -n ${a_drives[4]} ]];then
+						rev=${a_drives[4]}
+					else
+						rev='N/A'
+					fi
+					rev=" ${C1}rev$SEP3${C2} $rev"
+				fi
+				drive_string="$drive_id ${C1}model$SEP3${C2} $vendor$rev ${C1}dev-links$SEP3${C2} $drive_links"
+			fi
+			drive_data="${C1}Optical${counter}:${C2} $drive_string"
+			drive_data=$( create_print_line "$Line_Starter" "$drive_data" )
+			print_screen_output "$drive_data"
+			Line_Starter=' '
+			# 5 - speed
+			# 6 - multisession support
+			# 7 - MCN support
+			# 8 - audio read
+			# 9 - cdr
+			# 10 - cdrw
+			# 11 - dvd read
+			# 12 - dvdr
+			# 13 - dvdram
+			# 14 - state
+			if [[ $B_SHOW_FULL_OPTICAL == 'true' ]];then
+				if [[ -z ${a_drives[5]} ]];then
+					speed='N/A'
+				else
+					speed="${a_drives[5]}x"
+				fi
+				if [[ -z ${a_drives[8]} ]];then
+					audio='N/A'
+				elif [[ ${a_drives[8]} == 1 ]];then
+					audio='yes'
+				else
+					audio='no'
+				fi
+				audio=" ${C1}audio$SEP3${C2} $audio"
+				if [[ -z ${a_drives[6]} ]];then
+					multisession='N/A'
+				elif [[ ${a_drives[6]} == 1 ]];then
+					multisession='yes'
+				else
+					multisession='no'
+				fi
+				multisession=" ${C1}multisession$SEP3${C2} $multisession"
+				if [[ -z ${a_drives[11]} ]];then
+					dvd='N/A'
+				elif [[ ${a_drives[11]} == 1 ]];then
+					dvd='yes'
+				else
+					dvd='no'
+				fi
+				if [[ $B_EXTRA_DATA == 'true' ]];then
+					if [[ -z ${a_drives[14]} ]];then
+						state='N/A'
+					else
+						state="${a_drives[14]}"
+					fi
+					state=" ${C1}state$SEP3${C2} $state"
+				fi
+				if [[ -n ${a_drives[9]} && ${a_drives[9]} == 1 ]];then
+					rw_support='cd-r'
+					separator=','
+				fi
+				if [[ -n ${a_drives[10]} && ${a_drives[10]} == 1 ]];then
+					rw_support="${rw_support}${separator}cd-rw"
+					separator=','
+				fi
+				if [[ -n ${a_drives[12]} && ${a_drives[12]} == 1 ]];then
+					rw_support="${rw_support}${separator}dvd-r"
+					separator=','
+				fi
+				if [[ -n ${a_drives[13]} && ${a_drives[13]} == 1 ]];then
+					rw_support="${rw_support}${separator}dvd-ram"
+					separator=','
+				fi
+				if [[ -z $rw_support ]];then
+					rw_support='none'
+				fi
+				
+				drive_data="${C1}Features: speed$SEP3${C2} $speed$multisession$audio ${C1}dvd$SEP3${C2} $dvd ${C1}rw$SEP3${C2} $rw_support$state"
+				drive_data=$( create_print_line "$Line_Starter" "$drive_data" )
+				print_screen_output "$drive_data"
+			fi
+		done
+	else
+		:
 	fi
 	eval $LOGFE
 }
@@ -4712,21 +10408,10 @@ print_partition_data()
 {
 	eval $LOGFS
 	local a_partition_working='' partition_used='' partition_data=''
-	local counter=0 line_max=160  i=0 a_partition_data='' line_starter=''
+	local counter=0 i=0 a_partition_data='' line_starter='' line_max=$(( $COLS_INNER - 25 ))
 	local partitionIdClean='' part_dev='' full_dev='' part_label='' full_label=''
-	local part_uuid='' full_uuid='' dev_remote='' full_fs=''
-
-	# this handles the different, shorter, irc colors strings embedded in variable data
-	if [[ $B_RUNNING_IN_SHELL != 'true' ]];then
-		line_max=130
-	fi
-	# and no color string data at all
-	if [[ $SCHEME -eq 0 ]];then
-		line_max=75
-	fi
-	if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
-		line_max=20
-	fi
+	local part_uuid='' full_uuid='' dev_remote='' full_fs='' line_max_label_uuid=$COLS_INNER
+	local b_non_dev='false' holder=''
 
 	# set A_PARTITION_DATA
 	get_partition_data
@@ -4741,23 +10426,26 @@ print_partition_data()
 
 		if [[ $B_SHOW_PARTITIONS_FULL == 'true' ]] || [[ ${a_partition_working[4]} == 'main' ]];then
 			if [[ -n ${a_partition_working[2]} ]];then
-				partition_used=" ${C1}used:${C2} ${a_partition_working[2]} (${a_partition_working[3]})"
+				partition_used="${C1}used$SEP3${C2} ${a_partition_working[2]} (${a_partition_working[3]}) "
 			else
 				partition_used='' # reset partition used to null
 			fi
 			if [[ -n ${a_partition_working[5]} ]];then
 				full_fs="${a_partition_working[5]}"
 			else
-				full_fs='N/A' # reset partition used to null
+				full_fs='N/A' # reset partition fs type
 			fi
-			full_fs=" ${C1}fs:${C2} $full_fs"
+			full_fs="${C1}fs$SEP3${C2} $full_fs "
 
-			# don't show user names in output
 			if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]];then
 				if [[ -n ${a_partition_working[6]} ]];then
-					if [[ -z $( grep -E '(^//|:/)' <<< ${a_partition_working[6]} ) ]];then
+					if [[ -z $( grep -E '(^//|:/|non-dev)' <<< ${a_partition_working[6]} ) ]];then
 						part_dev="/dev/${a_partition_working[6]}"
 						dev_remote='dev'
+					elif [[ -n $( grep '^non-dev' <<< ${a_partition_working[6]} ) ]];then
+						holder=$( sed 's/non-dev-//' <<< ${a_partition_working[6]} )
+						part_dev="$holder"
+						dev_remote='raid'
 					else
 						part_dev="${a_partition_working[6]}"
 						dev_remote='remote'
@@ -4766,14 +10454,14 @@ print_partition_data()
 					dev_remote='dev'
 					part_dev='N/A'
 				fi
-				full_dev=" ${C1}$dev_remote:${C2} $part_dev"
+				full_dev="${C1}$dev_remote$SEP3${C2} $part_dev "
 				if [[ $B_SHOW_LABELS == 'true' && $dev_remote != 'remote' ]];then
 					if [[ -n ${a_partition_working[7]} ]];then
 						part_label="${a_partition_working[7]}"
 					else
 						part_label='N/A'
 					fi
-					full_label=" ${C1}label:${C2} $part_label"
+					full_label="${C1}label$SEP3${C2} $part_label "
 				fi
 				if [[ $B_SHOW_UUIDS == 'true' && $dev_remote != 'remote' ]];then
 					if [[ -n ${a_partition_working[8]} ]];then
@@ -4781,14 +10469,27 @@ print_partition_data()
 					else
 						part_uuid='N/A'
 					fi
-					full_uuid=" ${C1}uuid:${C2} $part_uuid"
+					full_uuid="${C1}uuid$SEP3${C2} $part_uuid"
 				fi
 			fi
-			partitionIdClean=$( sed -r 's|/home/(.*)/(.*)|/home/##/\2|' <<< ${a_partition_working[0]} )
+			# don't show user names in output
+			if [[ $B_OUTPUT_FILTER == 'true' ]];then
+				partitionIdClean=$( sed $SED_RX "s|/home/([^/]+)/(.*)|/home/$FILTER_STRING/\2|" <<< ${a_partition_working[0]} )
+			else
+				partitionIdClean=${a_partition_working[0]}
+			fi
+			id_size_fs="${C1}ID:${C2} $partitionIdClean ${C1}size$SEP3${C2} ${a_partition_working[1]} $partition_used$full_fs$full_dev"
+			label_uuid="$full_label$full_uuid"
+			# label/uuid always print one per line, so only wrap if it's very long
+			if [[ $B_SHOW_UUIDS == 'true' && $B_SHOW_LABELS == 'true' && $( calculate_line_length "$id_size_fs$label_uuid" ) -gt $line_max_label_uuid ]];then
+				a_partition_data[$counter]="$id_size_fs"
+				((counter++))
+				a_partition_data[$counter]="$label_uuid"
+			else
+				a_partition_data[$counter]="${a_partition_data[$counter]}$id_size_fs$label_uuid"
+			fi
 			# because these lines can vary widely, using dynamic length handling here
-			a_partition_data[$counter]="${a_partition_data[$counter]}${C1}ID:${C2}$partitionIdClean ${C1}size:${C2} ${a_partition_working[1]}$partition_used$full_fs$full_dev$full_label$full_uuid "
-
-			if [[ $( wc -c <<< ${a_partition_data[$counter]} ) -gt $line_max ]];then
+			if [[ $B_SHOW_LABELS == 'true' || $B_SHOW_UUIDS == 'true' ]] || [[ $( calculate_line_length "${a_partition_data[$counter]}" ) -gt $line_max ]];then
 				((counter++))
 			fi
 		fi
@@ -4808,6 +10509,20 @@ print_partition_data()
 	eval $LOGFE
 }
 
+print_program_version()
+{
+	local patch_version_number=$( get_patch_version_string )
+	local program_version="${C1}$SCRIPT_NAME$SEP3${C2} $SCRIPT_VERSION_NUMBER$patch_version_number${CN}"
+	# great trick from: http://ideatrash.net/2011/01/bash-string-padding-with-sed.html
+	# left pad: sed -e :a -e 's/^.\{1,80\}$/& /;ta'
+	# right pad: sed -e :a -e 's/^.\{1,80\}$/ &/;ta'
+	# center pad: sed -e :a -e 's/^.\{1,80\}$/ & /;ta'
+	#local line_max=$COLS_INNER
+	#program_version="$( sed -e :a -e "s/^.\{1,$line_max\}$/ &/;ta" <<< $program_version )" # use to create padding if needed
+	# program_version=$( create_print_line "Version:" "$program_version" )
+	print_screen_output "$program_version"
+}
+
 print_ps_data()
 {
 	eval $LOGFS
@@ -4815,12 +10530,12 @@ print_ps_data()
 	local b_print_first='true' 
 
 	if [[ $B_SHOW_PS_CPU_DATA == 'true' ]];then
-		get_ps_data 'cpu'
+		get_ps_tcm_data 'cpu'
 		print_ps_item 'cpu' "$b_print_first"
 		b_print_first='false' 
 	fi
 	if [[ $B_SHOW_PS_MEM_DATA == 'true' ]];then
-		get_ps_data 'mem'
+		get_ps_tcm_data 'mem'
 		print_ps_item 'mem' "$b_print_first"
 	fi
 	
@@ -4865,33 +10580,33 @@ print_ps_item()
 		
 		# handle the converted app names, with ~..~ means it didn't have a path
 		if [[ -n $( grep -E '^~.*~$' <<<  ${a_ps_data[0]} ) ]];then
-			app_daemon='daemon:'
+			app_daemon='daemon'
 		else
-			app_daemon='command:'
+			app_daemon='command'
 		fi
 
-		app_name=" ${C1}$app_daemon${C2} ${a_ps_data[0]}"
+		app_name=" ${C1}$app_daemon$SEP3${C2} ${a_ps_data[0]}"
 		if [[ ${a_ps_data[0]} != ${a_ps_data[2]} ]];then
-			app_name="$app_name ${C1}(started by:${C2} ${a_ps_data[2]}${C1})${C2}"
+			app_name="$app_name ${C1}(started by$SEP3${C2} ${a_ps_data[2]}${C1})${C2}"
 		fi
-		app_pid=" ${C1}pid:${C2} ${a_ps_data[6]}"
+		app_pid=" ${C1}pid$SEP3${C2} ${a_ps_data[6]}"
 		#  ${C1}user:${C2} ${a_ps_data[8]}
 		case $1 in
 			cpu)
-				app_cpu=" ${C1}cpu:${C2} ${a_ps_data[4]}%"
+				app_cpu=" ${C1}cpu$SEP3${C2} ${a_ps_data[4]}%"
 				if [[ $B_EXTRA_DATA == 'true' ]];then
-					extra_data=" ${C1}mem:${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
+					extra_data=" ${C1}mem$SEP3${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
 				fi
 				;;
 			mem)
-				app_mem=" ${C1}mem:${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
+				app_mem=" ${C1}mem$SEP3${C2} ${a_ps_data[7]}MB (${a_ps_data[5]}%)${C2}"
 				if [[ $B_EXTRA_DATA == 'true' ]];then
-					extra_data=" ${C1}cpu:${C2} ${a_ps_data[4]}%"
+					extra_data=" ${C1}cpu$SEP3${C2} ${a_ps_data[4]}%"
 				fi
 				;;
 		esac
 		(( line_counter++ ))
-		count_nu="${C1}$line_counter -${C2}"
+		count_nu="${C1}$line_counter:${C2}"
 		full_line="$count_nu$app_cpu$app_mem$app_name$app_pid$extra_data"
 		ps_data=$( create_print_line " " "$full_line" )
 		print_screen_output "$ps_data"
@@ -4900,13 +10615,315 @@ print_ps_item()
 	eval $LOGFE
 }
 
+print_raid_data()
+{
+	eval $LOGFS
+	local device='' device_string='' device_state='' raid_level='' device_components=''
+	local device_report='' u_data='' blocks='' super_blocks='' algorithm='' chunk_size=''
+	local bitmap_values='' recovery_progress_bar='' recovery_percent='' recovered_sectors=''
+	local finish_time='' recovery_speed='' raid_counter=0 device_counter=1 basic_counter=1
+	local a_raid_working='' raid_data='' kernel_support='' read_ahead='' unused_devices=''
+	local basic_raid='' basic_raid_separator='' basic_raid_plural='' inactive=''
+	local component_separator='' device_id='' print_string='' loop_limit=0 array_count_unused=''
+	local array_count='' raid_event='' b_print_lines='true'
+	local no_raid_detected='' dev_string='/dev/'
+	local empty_raid_data='' report_size='report' blocks_avail='blocks' chunk_raid_usage='chunk size'
+	
+	if [[ -n $BSD_TYPE ]];then
+		no_raid_detected='No zfs software RAID detected - other types not yet supported.'
+		empty_raid_data='No zfs RAID data available - other types not yet supported.'
+		report_size='full size'
+		blocks_avail='available size'
+		chunk_raid_usage='raid allocated'
+	else
+		no_raid_detected="No RAID data available - $FILE_MDSTAT is missing - is md_mod kernel module loaded?"
+		empty_raid_data="No RAID devices detected - $FILE_MDSTAT and md_mod kernel raid module present"
+	fi
+	
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		dev_string=''
+	fi
+	if [[ $B_RAID_SET != 'true' ]];then
+		get_raid_data
+	fi
+
+	for (( i=0; i < ${#A_RAID_DATA[@]}; i++ ))
+	do
+		IFS=","
+		a_raid_working=(${A_RAID_DATA[i]})
+		IFS="$ORIGINAL_IFS"
+		
+		# reset on each iteration
+		algorithm=''
+		bitmap_values=''
+		blocks=''
+		component_separator=''
+		device=''
+		device_components=''
+		device_id=''
+		device_report=''
+		device_state=''
+		failed=''
+		finish_time=''
+		inactive=''
+		raid_event=''
+		raid_level=''
+		recovery_percent=''
+		recovery_progress_bar=''
+		recovered_sectors=''
+		recovery_speed=''
+		spare=''
+		super_blocks=''
+		u_data=''
+		
+		if [[ -n $( grep '^md' <<< ${a_raid_working[0]} ) && -z $BSD_TYPE ]] || \
+		[[ -n $BSD_TYPE && ${a_raid_working[0]} != '' ]];then
+			if [[ $B_SHOW_BASIC_RAID == 'true' ]];then
+				if [[ $basic_raid != '' ]];then
+					basic_raid_plural='s'
+				fi
+				if [[ ${a_raid_working[1]} == 'inactive' ]];then
+					inactive=" - ${a_raid_working[1]}"
+				fi
+				basic_raid="$basic_raid$basic_raid_separator${C1}$basic_counter${SEP3}${C2} $dev_string${a_raid_working[0]}$inactive"
+				basic_raid_separator=' '
+				(( basic_counter++ ))
+			else
+				device_id="-$device_counter"
+				device="$dev_string${a_raid_working[0]}"
+				
+				(( device_counter++ ))
+				if [[ ${a_raid_working[1]} != '' ]];then
+					device_state=" - ${a_raid_working[1]}"
+				fi
+				
+				if [[ ${a_raid_working[2]} == '' ]];then
+					raid_level='N/A'
+				else
+					raid_level=${a_raid_working[2]}
+				fi
+				# there's one case: md0 : inactive  that has to be protected against
+				if [[ ${a_raid_working[2]} == '' && ${a_raid_working[1]} == 'inactive' ]];then
+					raid_level=''
+				else
+					raid_level=" ${C1}raid${SEP3}${C2} $raid_level"
+				fi
+				if [[ ${a_raid_working[4]} != '' ]];then
+					device_report="${a_raid_working[4]}"
+				else
+					device_report="N/A"
+				fi
+				if [[ $B_EXTRA_DATA == 'true' ]];then
+					if [[ ${a_raid_working[6]} != '' ]];then
+						blocks=${a_raid_working[6]}
+					else
+						blocks='N/A'
+					fi
+					blocks=" ${C1}$blocks_avail${SEP3}${C2} $blocks"
+					
+					if [[ ${a_raid_working[9]} != '' ]];then
+						chunk_size=${a_raid_working[9]}
+					else
+						chunk_size='N/A'
+					fi
+					chunk_size=" ${C1}$chunk_raid_usage${SEP3}${C2} $chunk_size"
+					if [[ ${a_raid_working[10]} != '' ]];then
+						bitmap_value='true'
+						bitmap_value=" ${C1}bitmap${SEP3}${C2} $bitmap_value"
+					fi
+				fi
+				if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+					if [[ ${a_raid_working[5]} != '' ]];then
+						u_data=" ${a_raid_working[5]}"
+					fi
+					if [[ ${a_raid_working[7]} != '' ]];then
+						super_blocks=" ${C1}super blocks${SEP3}${C2} ${a_raid_working[7]}"
+					fi
+					if [[ ${a_raid_working[8]} != '' ]];then
+						algorithm=" ${C1}algorithm${SEP3}${C2} ${a_raid_working[8]}"
+					fi
+				fi
+				if [[ ${a_raid_working[3]} == '' ]];then
+					if [[ ${a_raid_working[1]} != 'inactive' ]];then
+						device_components='N/A'
+					fi
+				else
+					for component in ${a_raid_working[3]}
+					do
+						if [[ $B_EXTRA_DATA != 'true' ]];then
+							component=$( sed 's/\[[0-9]\+\]//' <<< $component )
+						fi
+						# NOTE: for bsd zfs, states are: ONLINE,DEGRADED,OFFLINE (at least)
+						if [[ -n $( grep -E '(F|DEGRADED)' <<< $component ) ]];then
+							component=$( sed -e 's/(F)//' -e 's/F//' -e 's/DEGRADED//' <<<  $component )
+							failed="$failed $component"
+							component=''
+						elif [[ -n $( grep -E '(S|OFFLINE)' <<< $component ) ]];then
+							component=$( sed -e 's/(S)//' -e 's/S//' -e 's/OFFLINE//' <<<  $component )
+							spare="$spare $component"
+							component=''
+						else
+							device_components="$device_components$component_separator$component"
+							component_separator=' '
+						fi
+					done
+
+					if [[ $failed != '' ]];then
+						failed=" ${C1}FAILED${SEP3}${C2}$failed${C2}"
+					fi
+					if [[ $spare != '' ]];then
+						spare=" ${C1}spare${SEP3}${C2}$spare${C2}"
+					fi
+					
+					if [[ -n $device_components || -n $spare || -n $failed ]];then
+						if [[ $B_EXTRA_DATA != 'true' && -z $BSD_TYPE ]];then
+							if [[ $device_report != 'N/A' && -n $device_components ]];then
+								device_components="$device_report - $device_components"
+							fi
+						fi
+						if [[ $device_components == '' ]];then
+							device_components='none'
+						fi
+						device_components="${C1}online${SEP3}${C2} $device_components"
+						device_components=" ${C1}components${SEP3}${C2} $device_components$failed$spare"
+					fi
+				fi
+				a_raid_data[$raid_counter]="${C1}Device$device_id${SEP3}${C2} $device$device_state$raid_level$device_components"
+				
+				if [[ $B_EXTRA_DATA == 'true' && ${a_raid_working[1]} != 'inactive' ]];then
+					a_raid_data[$raid_counter]="${C1}Device$device_id${SEP3}${C2} $device$device_state$device_components"
+					(( raid_counter++ ))
+					print_string="${C1}Info${SEP3}${C2}$raid_level ${C1}$report_size${SEP3}${C2} $device_report$u_data"
+					print_string="$print_string$blocks$chunk_size$bitmap_value$super_blocks$algorithm"
+					a_raid_data[$raid_counter]="$print_string"
+				else
+					a_raid_data[$raid_counter]="${C1}Device$device_id${SEP3}${C2} $device$device_state$raid_level$device_components"
+				fi
+				(( raid_counter++ ))
+				
+				# now let's do the recover line if required
+				if [[ ${a_raid_working[12]} != '' ]];then
+					recovery_percent=$( cut -d '~' -f 2 <<< ${a_raid_working[12]} )
+					if [[ ${a_raid_working[14]} != '' ]];then
+						finish_time=${a_raid_working[14]}
+					else
+						finish_time='N/A'
+					fi
+					finish_time=" ${C1}time remaining${SEP3}${C2} $finish_time"
+					if [[ $B_EXTRA_DATA == 'true' ]];then
+						if [[ ${a_raid_working[13]} != '' ]];then
+							recovered_sectors=" ${C1}sectors${SEP3}${C2} ${a_raid_working[13]}"
+						fi
+					fi
+					if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+						if [[ ${a_raid_working[11]} != '' ]];then
+							recovery_progress_bar=" ${a_raid_working[11]}"
+						fi
+						if [[ ${a_raid_working[15]} != '' ]];then
+							recovery_speed=" ${C1}speed${SEP3}${C2} ${a_raid_working[15]}"
+						fi
+					fi
+					
+					a_raid_data[$raid_counter]="${C1}Recovering${SEP3}${C2} $recovery_percent$recovery_progress_bar$recovered_sectors$finish_time$recovery_speed"
+					(( raid_counter++ ))
+				fi
+			fi
+		elif [[ ${a_raid_working[0]} == 'KernelRaidSupport' ]];then
+			if [[ ${a_raid_working[1]} == '' ]];then
+				kernel_support='N/A'
+			else
+				kernel_support=${a_raid_working[1]}
+			fi
+			kernel_support=" ${C1}supported${SEP3}${C2} $kernel_support"
+		elif [[ ${a_raid_working[0]} == 'ReadAhead' ]];then
+			if [[ ${a_raid_working[1]} != '' ]];then
+				read_ahead=${a_raid_working[1]}
+				read_ahead=" ${C1}read ahead${SEP3}${C2} $read_ahead"
+			fi
+		elif [[ ${a_raid_working[0]} == 'UnusedDevices' ]];then
+			if [[ ${a_raid_working[1]} == '' ]];then
+				unused_devices='N/A'
+			else
+				unused_devices=${a_raid_working[1]}
+			fi
+			unused_devices="${C1}Unused Devices${SEP3}${C2} $unused_devices"
+		elif [[ ${a_raid_working[0]} == 'raidEvent' ]];then
+			if [[ ${a_raid_working[1]} != '' ]];then
+				raid_event=${a_raid_working[1]}
+				raid_event=" ${C1}Raid Event${SEP3}${C2} ${a_raid_working[1]}"
+			fi
+		fi
+	done
+	
+	if [[ $B_SHOW_BASIC_RAID == 'true' && $basic_raid != '' ]];then
+		a_raid_data[0]="${C1}Device$basic_raid_plural${SEP3}${C2} $basic_raid"
+	fi
+	# note bsd temp test hack to make it run
+	if [[ $B_MDSTAT_FILE != 'true' && -z $BSD_TYPE ]] || \
+	[[ -n $BSD_TYPE && $B_BSD_RAID == 'false' ]];then
+		if [[ $B_SHOW_RAID_R == 'true' ]];then
+			a_raid_data[0]="$no_raid_detected"
+		else
+			b_print_lines='false'
+		fi
+	else
+		if [[ ${a_raid_data[0]} == '' ]];then
+			if [[ $B_SHOW_BASIC_RAID != 'true' ]];then
+				a_raid_data[0]="$empty_raid_data"
+			else
+				b_print_lines='false'
+			fi
+		fi
+		# now let's add on the system line and the unused device line. Only print on -xx
+		if [[ $kernel_support$read_ahead$raid_event != '' ]];then
+			array_count=${#a_raid_data[@]}
+			a_raid_data[array_count]="${C1}System${SEP3}${C2}$kernel_support$read_ahead$raid_event"
+			loop_limit=1
+		fi
+		if [[ $unused_devices != '' ]];then
+			array_count_unused=${#a_raid_data[@]}
+			a_raid_data[array_count_unused]="$unused_devices"
+			loop_limit=2
+		fi
+	fi
+
+	# we don't want to print anything if it's -b and no data is present, just a waste of a line
+	if [[ $b_print_lines == 'true' ]];then
+		# print out all lines, line starter on first line
+		for (( i=0; i < ${#a_raid_data[@]} - $loop_limit;i++ ))
+		do
+			if [[ $i -eq 0 ]];then
+				line_starter='RAID:'
+			else
+				line_starter=' '
+			fi
+			if [[ $B_EXTRA_EXTRA_DATA == 'true' && $array_count != '' ]];then
+				if [[ $i == 0 ]];then
+					raid_data=$( create_print_line "$line_starter" "${a_raid_data[array_count]}" )
+					print_screen_output "$raid_data"
+					line_starter=' '
+				fi
+			fi
+			raid_data=$( create_print_line "$line_starter" "${a_raid_data[i]}" )
+			print_screen_output "$raid_data"
+			if [[ $B_EXTRA_EXTRA_DATA == 'true' && $array_count_unused != '' ]];then
+				if [[ $i == $(( array_count_unused - 2 )) ]];then
+					raid_data=$( create_print_line "$line_starter" "${a_raid_data[array_count_unused]}" )
+					print_screen_output "$raid_data"
+				fi
+			fi
+		done
+	fi
+	
+	eval $LOGFE
+}
 
 # currently only apt using distros support this feature, but over time we can add others
 print_repo_data()
 {
 	eval $LOGFS
 	local repo_count=0 repo_line='' file_name='' file_content='' file_name_holder=''
-	local repo_full='' b_print_next_line='false' 
+	local repo_full='' b_print_next_line='false' repo_type=''
 	
 	get_repo_data
 	
@@ -4915,8 +10932,9 @@ print_repo_data()
 		while read repo_line
 		do
 			(( repo_count++ ))
-			file_name=$( cut -d ':' -f 1 <<< $repo_line )
-			file_content=$( cut -d ':' -f 2-6 <<< $repo_line )
+			repo_type=$( cut -d ':' -f 1 <<< $repo_line )
+			file_name=$( cut -d ':' -f 2 <<< $repo_line )
+			file_content=$( cut -d ':' -f 3-7 <<< $repo_line )
 			# this will dump unwanted white space line starters. Some irc channels
 			# use bots that show page title for urls, so need to break the url by adding 
 			# a white space.
@@ -4925,12 +10943,13 @@ print_repo_data()
 			else
 				file_content=$( echo $file_content )
 			fi
+			# echo $file_name : $file_name_holder : $repo_type : $file_content
 			# check file name, if different, update the holder for print out
 			if [[ $file_name != $file_name_holder ]];then
-				if [[ $REPO_FILE_ID != 'pisi repo' ]];then
-					repo_full="${C1}Active $REPO_FILE_ID in file:${C2} $file_name"
+				if [[ $repo_type == 'pisi repo' || $repo_type == 'urpmq repo' ]];then
+					repo_full="${C1}$repo_type:${C2} $file_name"
 				else
-					repo_full="${C1}$REPO_FILE_ID:${C2} $file_name"
+					repo_full="${C1}Active $repo_type in file:${C2} $file_name"
 				fi
 				file_name_holder=$file_name
 				b_print_next_line='true'
@@ -4964,16 +10983,22 @@ print_sensors_data()
 	local mobo_temp='' cpu_temp='' psu_temp='' cpu_fan='' mobo_fan='' ps_fan='' sys_fans='' sys_fans2='' 
 	local temp_data='' fan_data='' fan_data2='' b_is_error='false' fan_count=0 gpu_temp=''
 	local a_sensors_working=''
+	local no_sensors_message='None detected - is lm-sensors installed and configured?'
+	local Sensors_Data="$( get_sensors_output )"
 	get_sensors_data
 	
+	if [[ $BSD_TYPE == 'bsd' ]];then
+		no_sensors_message='This feature is not yet supported for BSD systems.'
+	fi
+	
 	IFS=","
 	a_sensors_working=( ${A_SENSORS_DATA[0]} )
 	IFS="$ORIGINAL_IFS"
 	# initial error cases, for missing app or unconfigured sensors. Note that array 0
-	# always has at least 3 items, cpu/mobo/psu temp in it. If it's a single item, then
-	# it's an error message, not the real data arrays.
-	if [[ ${#a_sensors_working[@]} -eq 1 ]];then
-		cpu_temp="${C1}Error:${C2} ${A_SENSORS_DATA[0]}"
+	# always has at least 3 items, cpu/mobo/psu temp in it. If the count is 0, then
+	# no sensors are installed/configured
+	if [[ ${#a_sensors_working[@]} -eq 0 ]];then
+		cpu_temp=$no_sensors_message
 		b_is_error='true'
 	else
 		for (( i=0; i < ${#A_SENSORS_DATA[@]}; i++ ))
@@ -4989,17 +11014,17 @@ print_sensors_data()
 					else
 						cpu_temp='N/A'
 					fi
-					cpu_temp="${C1}System Temperatures: cpu:${C2} $cpu_temp "
+					cpu_temp="${C1}System Temperatures: cpu$SEP3${C2} $cpu_temp "
 
 					if [[ -n ${a_sensors_working[1]} ]];then
 						mobo_temp=${a_sensors_working[1]}
 					else
 						mobo_temp='N/A'
 					fi
-					mobo_temp="${C1}mobo:${C2} $mobo_temp "
+					mobo_temp="${C1}mobo$SEP3${C2} $mobo_temp "
 
 					if [[ -n ${a_sensors_working[2]} ]];then
-						psu_temp="${C1}psu:${C2} ${a_sensors_working[2]} "
+						psu_temp="${C1}psu$SEP3${C2} ${a_sensors_working[2]} "
 					fi
 					gpu_temp=$( get_gpu_temp_data )
 					# dump the unneeded screen data for single gpu systems 
@@ -5007,7 +11032,7 @@ print_sensors_data()
 						gpu_temp=$( cut -d ':' -f 2 <<< $gpu_temp )
 					fi
 					if [[ -n $gpu_temp ]];then
-						gpu_temp="${C1}gpu:${C2} ${gpu_temp} "
+						gpu_temp="${C1}gpu$SEP3${C2} ${gpu_temp} "
 					fi
 					;;
 				# then the fan data from main fan array
@@ -5024,18 +11049,18 @@ print_sensors_data()
 								else
 									cpu_fan='N/A'
 								fi
-								cpu_fan="${C1}Fan Speeds (in rpm): cpu:${C2} $cpu_fan "
+								cpu_fan="${C1}Fan Speeds (in rpm): cpu$SEP3${C2} $cpu_fan "
 								(( fan_count++ ))
 								;;
 							1)
 								if [[ -n ${a_sensors_working[1]} ]];then
-									mobo_fan="${C1}mobo:${C2} ${a_sensors_working[1]} "
+									mobo_fan="${C1}mobo$SEP3${C2} ${a_sensors_working[1]} "
 									(( fan_count++ ))
 								fi
 								;;
 							2)
 								if [[ -n ${a_sensors_working[2]} ]];then
-									ps_fan="${C1}psu:${C2} ${a_sensors_working[2]} "
+									ps_fan="${C1}psu$SEP3${C2} ${a_sensors_working[2]} "
 									(( fan_count++ ))
 								fi
 								;;
@@ -5044,9 +11069,9 @@ print_sensors_data()
 									fan_number=$(( $j - 2 )) # sys fans start on array key 5
 									# wrap after fan 6 total
 									if [[ $fan_count -lt 7 ]];then
-										sys_fans="$sys_fans${C1}sys-$fan_number:${C2} ${a_sensors_working[$j]} "
+										sys_fans="$sys_fans${C1}sys-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
 									else
-										sys_fans2="$sys_fans2${C1}sys-$fan_number:${C2} ${a_sensors_working[$j]} "
+										sys_fans2="$sys_fans2${C1}sys-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
 									fi
 									(( fan_count++ ))
 								fi
@@ -5063,9 +11088,9 @@ print_sensors_data()
 									fan_number=$(( $j + 1 )) # sys fans start on array key 5
 									# wrap after fan 6 total
 									if [[ $fan_count -lt 7 ]];then
-										sys_fans="$sys_fans${C1}fan-$fan_number:${C2} ${a_sensors_working[$j]} "
+										sys_fans="$sys_fans${C1}fan-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
 									else
-										sys_fans2="$sys_fans2${C1}fan-$fan_number:${C2} ${a_sensors_working[$j]} "
+										sys_fans2="$sys_fans2${C1}fan-$fan_number$SEP3${C2} ${a_sensors_working[$j]} "
 									fi
 									(( fan_count++ ))
 								fi
@@ -5100,23 +11125,87 @@ print_sensors_data()
 print_system_data()
 {
 	eval $LOGFS
-	local system_data='' bits=''
-	local host_name=$( hostname )
-	local current_kernel=$( uname -rm ) # | gawk '{print $1,$3,$(NF-1)}' )
+	local system_data='' bits='' desktop_environment='' dm_data='' de_extra_data=''
+	local host_kernel_string='' de_distro_string='' host_string='' desktop_type='Desktop'
+	local host_name=$HOSTNAME
+	local current_kernel=$( get_kernel_version ) 
 	local distro="$( get_distro_data )"
-		# check for 64 bit first
-	if [[ -n $( uname -m | grep -o 'x86_64' ) ]];then
-		bits="(64 bit)"
+	local tty_session=''
+	
+	# I think these will work, maybe, if logged in as root and in X
+	if [[ $B_RUNNING_IN_DISPLAY == 'true' ]];then
+		desktop_environment=$( get_desktop_environment )
+		if [[ -z $desktop_environment ]];then
+			desktop_environment='N/A'
+		fi
+		
+		if [[  $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
+			de_extra_data=$( get_desktop_extra_data )
+			if [[ -n $de_extra_data ]];then
+				de_extra_data=" ${C1}info$SEP3${C2} $de_extra_data"
+			fi
+		fi
+	else
+		tty_session=$( get_tty_number )
+		if [[ -z $tty_session && $B_CONSOLE_IRC == 'true' ]];then
+			tty_session=$( get_tty_console_irc )
+		fi
+		if [[ -n $tty_session ]];then
+			tty_session=" $tty_session"
+		fi
+		desktop_environment="tty$tty_session"
+		desktop_type='Console'
+	fi
+	# having dm type can be useful if you are accessing remote system
+	# or are out of X and don't remember which dm is running the system
+	if [[  $B_EXTRA_EXTRA_DATA == 'true' ]];then
+		dm_data=$( get_display_manager )
+		# here we only want the dm info to show N/A if in X
+		if [[ -z $dm_data && $B_RUNNING_IN_DISPLAY == 'true' ]];then
+			dm_data='N/A'
+		fi
+		# only print out of X if dm_data has info, then it's actually useful, but
+		# for headless servers, no need to print dm stuff.
+		if [[ -n $dm_data ]];then
+			dm_data=" ${C1}dm$SEP3${C2} $dm_data"
+		fi
+	fi
+	
+	de_distro_string="${C1}$desktop_type$SEP3${C2} $desktop_environment$de_extra_data$dm_data ${C1}Distro$SEP3${C2} $distro"
+	if [[ $B_EXTRA_DATA == 'true' ]];then
+		gcc_string=$( get_gcc_kernel_version )
+		if [[ -n $gcc_string ]];then
+			gcc_string=", ${C1}gcc$SEP3${C2} $gcc_string"
+		fi
+	fi
+	# check for 64 bit first
+	if [[ -n $( uname -m | grep -E '(x86_64|amd64)' ) ]];then
+		bits="64"
 	else
-		bits="(32 bit)"
+		bits="32"
 	fi
-
+	bits=" (${bits} bit${gcc_string})"
 	if [[ $B_SHOW_HOST == 'true' ]];then
-		system_data=$( create_print_line "System:" "${C1}Host${C2} $host_name ${C1}Kernel${C2}" )
+		if [[ -z $HOSTNAME ]];then
+			if [[ -n $( type p hostname ) ]];then
+				host_name=$( hostname )
+			fi
+			if [[ -z $host_name ]];then
+				host_name='N/A'
+			fi
+		fi
+		host_string="${C1}Host$SEP3${C2} $host_name "
+		system_data=$( create_print_line "System:" "$host_string$host_name ${C1}Kernel$SEP3${C2}" )
+	fi
+	host_kernel_string="$host_string${C1}Kernel$SEP3${C2} $current_kernel$bits "
+	if [[ $( calculate_line_length "$host_kernel_string$de_distro_string" ) -lt $COLS_INNER ]];then
+		system_data="$host_kernel_string$de_distro_string"
+		system_data=$( create_print_line "System:" "$system_data" )
 	else
-		system_data=$( create_print_line "System:" "${C1}Kernel${C2}" )
+		system_data=$( create_print_line "System:" "$host_kernel_string" )
+		print_screen_output "$system_data"
+		system_data=$( create_print_line " " "$de_distro_string" )
 	fi
-	system_data="$system_data $current_kernel $bits ${C1}Distro${C2} $distro"
 	print_screen_output "$system_data"
 	eval $LOGFE
 }
@@ -5126,6 +11215,7 @@ print_unmounted_partition_data()
 	eval $LOGFS
 	local a_unmounted_data='' line_starter='' unmounted_data='' full_fs=''
 	local full_dev='' full_size='' full_label='' full_uuid='' full_string=''
+	local bsd_unsupported='This feature is not yet supported for BSD systems.'
 	
 	if [[ -z ${A_PARTITION_DATA} ]];then
 		get_partition_data
@@ -5149,23 +11239,23 @@ print_unmounted_partition_data()
 			else
 				full_size=${a_unmounted_data[1]}
 			fi
-			full_size="${C1}size:${C2} $full_size"
+			full_size="${C1}size$SEP3${C2} $full_size"
 			if [[ -z ${a_unmounted_data[2]} ]];then
 				full_label='N/A'
 			else
 				full_label=${a_unmounted_data[2]}
 			fi
-			full_label="${C1}label:${C2} $full_label"
+			full_label="${C1}label$SEP3${C2} $full_label"
 			if [[ -z ${a_unmounted_data[3]} ]];then
 				full_uuid='N/A'
 			else
 				full_uuid=${a_unmounted_data[3]}
 			fi
-			full_uuid="${C1}uuid:${C2} $full_uuid"
+			full_uuid="${C1}uuid$SEP3${C2} $full_uuid"
 			if [[ -z ${a_unmounted_data[4]} ]];then
 				full_fs=''
 			else
-				full_fs="${C1}fs:${C2} ${a_unmounted_data[4]}"
+				full_fs="${C1}fs$SEP3${C2} ${a_unmounted_data[4]}"
 			fi
 			full_string="$full_dev $full_size $full_label $full_uuid $full_fs"
 			if [[ $i -eq 0 ]];then
@@ -5173,17 +11263,159 @@ print_unmounted_partition_data()
 			else
 				line_starter=' '
 			fi
+			# temporary message to indicate not yet supported
+			if [[ $BSD_TYPE == 'bsd' ]];then
+				full_string=$bsd_unsupported
+			fi
 			unmounted_data=$( create_print_line "$line_starter" "$full_string" )
 			print_screen_output "$unmounted_data"
 		done
 	else
-		unmounted_data=$( create_print_line "Unmounted:" "No unmounted partitions detected." )
+		unmounted_data=$( create_print_line "Unmounted:" "No unmounted partitions detected" )
 		print_screen_output "$unmounted_data"
 	fi
 	
 	eval $LOGFE
 }
 
+print_weather_data()
+{
+	eval $LOGFS
+	
+	local weather_data='' location_string='' local_time='' time_string='' pressure=''
+	local a_location='' a_weather='' weather_string='' weather='' temp='' winds='' humidity=''
+	local time_zone='' observation_time='' city='' state='' country='' altitude=''
+	local heat_index="" wind_chill='' dewpoint='' xxx_humidity=''
+	local openP='(' closeP=')'
+	
+	if [[ $B_RUNNING_IN_SHELL == 'false' ]];then
+		openP=''
+		closeP=''
+	fi
+	
+	get_weather_data
+	
+	# city ";" regionCode ";" regionName ";" countryName ";" countryCode ";" countryCode3 
+	#  ";" latitude "," longitude ";" postalCode ";" timeZone
+	
+	# observationTime ";" localTime ";" weather ";" tempString ";" humidity 
+	# ";" windString ";" pressureString ";" dewpointString ";" heatIndexString
+	# ";" windChillString ";" siteElevation
+
+	if [[ ${#A_WEATHER_DATA[@]} -eq 2 ]];then
+		IFS=";"
+		a_location=(${A_WEATHER_DATA[0]})
+		a_weather=(${A_WEATHER_DATA[1]})
+		IFS="$ORIGINAL_IFS"
+		
+		if [[ -n ${a_weather[3]} ]];then
+			temp=${a_weather[3]}
+		else
+			temp='N/A'
+		fi
+		if [[ -n ${a_weather[2]} ]];then
+			weather=" - ${a_weather[2]}"
+		else
+			weather=''
+		fi
+		if [[ $B_EXTRA_DATA == 'true' ]];then
+			if [[ -n ${a_weather[5]} ]];then
+				winds=" ${C1}Wind$SEP3${C2} ${a_weather[5]}"
+			fi
+		fi
+		if [[ $B_EXTRA_EXTRA_DATA == 'true' ]];then
+			if [[ -n ${a_weather[4]} ]];then
+				humidity=" ${C1}Humidity$SEP3${C2} ${a_weather[4]}"
+			fi
+			if [[ -n ${a_weather[6]} ]];then
+				pressure="${C1}Pressure$SEP3${C2} ${a_weather[6]} "
+			fi
+		fi
+		weather_string="${C1}Conditions$SEP3${C2} $temp$weather$winds$humidity"
+		
+		if [[ -n ${a_weather[1]} ]];then
+			local_time=" ${a_weather[1]}"
+		else
+			local_time=" $(date)"
+		fi
+		if [[ $B_EXTRA_DATA == 'true' && -n ${a_location[8]} ]];then
+			time_zone=" (${a_location[8]})"
+		fi
+		time_string="${C1}Time$SEP3${C2}$local_time$time_zone"
+
+		if [[ $B_EXTRA_DATA != 'true' ]];then
+			weather_data="$weather_string $time_string"
+			weather_data=$( create_print_line "Weather:" "$weather_data" )
+			print_screen_output "$weather_data"
+		else
+			weather_data="$weather_string"
+			weather_data=$( create_print_line "Weather:" "$weather_data" )
+			print_screen_output "$weather_data"
+			if [[ $B_EXTRA_EXTRA_EXTRA_DATA == 'true' ]];then
+				if [[ -n ${a_weather[8]} ]];then
+					heat_index="${C1}Heat Index$SEP3${C2} ${a_weather[8]} "
+				fi
+				if [[ -n ${a_weather[9]} ]];then
+					wind_chill="${C1}Wind Chill$SEP3${C2} ${a_weather[9]} "
+				fi
+				if [[ -n ${a_weather[7]} ]];then
+					dew_point="${C1}Dew Point$SEP3${C2} ${a_weather[7]} "
+				fi
+				if [[ -n ${a_weather[0]} ]];then
+					observation_time=" ${C1}Observation Time$SEP3${C2} ${a_weather[0]} "
+				fi
+				if [[ $B_OUTPUT_FILTER != 'true' ]];then
+					if [[ -n ${a_location[0]} ]];then
+						city=" ${a_location[0]}"
+					fi
+					if [[ -n ${a_location[1]} ]];then
+						state=" ${a_location[1]}"
+					fi
+					if [[ -n ${a_location[5]} ]];then
+						country=" $openP${a_location[5]}$closeP"
+					fi
+					if [[ -n ${a_weather[10]} ]];then
+						altitude=" ${C1}Altitude$SEP3${C2} ${a_weather[10]}"
+					fi
+					location_string="${C1}Location$SEP3${C2}$city$state$country$altitude "
+				else
+					location_string=$time_string$observation_time
+					time_string=''
+					observation_time=''
+				fi
+				# the last three are oftenblank
+				if [[ -z "$heat_index$wind_chill$dew_point" ]];then
+					weather_data=$( create_print_line " " "$pressure$location_string" )
+					print_screen_output "$weather_data"
+				else
+					weather_data=$( create_print_line " " "$pressure$heat_index$wind_chill$dew_point" )
+					print_screen_output "$weather_data"
+					if [[ $B_OUTPUT_FILTER != 'true' ]];then
+						weather_data=$( create_print_line " " "$location_string" )
+						print_screen_output "$weather_data"
+					fi
+				fi
+				if [[ -n $time_string$observation_time ]];then
+					weather_data=$( create_print_line " " "$time_string$observation_time" )
+					print_screen_output "$weather_data"
+				fi
+			else
+				if [[ -n $pressure$time_string ]];then
+					weather_data="$pressure$time_string"
+					weather_data=$( create_print_line " " "$weather_data" )
+					print_screen_output "$weather_data"
+				fi
+			fi
+		fi
+	else
+		weather_data=$( create_print_line "Weather:" "Weather data failure: $(date)" )
+		print_screen_output "$weather_data"
+		weather_data=$( create_print_line " " "${A_WEATHER_DATA}" )
+		print_screen_output "$weather_data"
+	fi
+	eval $LOGFE
+}
+
 ########################################################################
 #### SCRIPT EXECUTION
 ########################################################################