diff --git a/cron/config.info b/cron/config.info
index 8ff2608bb..d3f7551cc 100644
--- a/cron/config.info
+++ b/cron/config.info
@@ -2,7 +2,7 @@ line1=Configurable options,11
 max_len=Maximum command length to display,3,Unlimited
 max_jobs=Maximum Cron jobs to show,3,Unlimited
 show_time=Show job schedules?,1,1-Yes,0-No
-show_comment=Show job comments?,1,1-Yes,0-No
+show_comment=Show job description?,1,1-Yes,0-No
 show_run=Display running status of jobs?,1,2-Yes, and allow starting and stopping,1-Yes,0-No
 show_next=Show next time each job will run?,1,1-Yes,0-No
 match_mode=Find job processes by,1,1-Command only,0-Command and arguments
diff --git a/smart-status/smart-status-lib.pl b/smart-status/smart-status-lib.pl
index 5da08ed45..07e445ff8 100755
--- a/smart-status/smart-status-lib.pl
+++ b/smart-status/smart-status-lib.pl
@@ -401,6 +401,11 @@ if ($config{'attribs'}) {
 			push(@attribs, [ $2, $10, undef, $4 ]);
 			$attribs[$#attribs]->[0] =~ s/_/ /g;
 			}
+		elsif (/^(?|(\w+.*):\s+([0-9]+(,[0-9]+)+)|(\w+.*):\s+(\d+x\d+)|(\w+.*):\s+(\d+%)|^(\w+.*):\s+(\d+))/) {
+			# NVME style
+			$doneknown = 1;
+			push(@attribs, [ $1, $2, undef, undef ]);			
+			}
 		elsif (/^(\S.*\S):\s+\(\s*(\S+)\)\s*(.*)/ && !$doneknown) {
 			# A known attribute
 			local $attrib = [ $1, $2, $3 ];
diff --git a/system-status/system-status-lib.pl b/system-status/system-status-lib.pl
index 8ef47d099..85f399594 100755
--- a/system-status/system-status-lib.pl
+++ b/system-status/system-status-lib.pl
@@ -428,6 +428,7 @@ if (!$config{'collect_notemp'} &&
 		my $st = &smart_status::get_drive_status($d->{'device'}, $d);
 		foreach my $a (@{$st->{'attribs'}}) {
 			if (($a->[0] =~ /^Temperature\s+Celsius$/i ||
+			     $a->[0] =~ /^Temperature$/i ||
 			     $a->[0] =~ /^Airflow\s+Temperature\s+Cel/i) &&
 			    $a->[1] > 0) {
 				push(@rv, { 'device' => $d->{'device'},