diff --git a/sm5/atacmds.cpp b/sm5/atacmds.cpp
index 0ff0dc24d667121a5a6343292c52191c28ad1fcf..d5ee98466f4cf649548f6eb7cb7f3637b110a263 100644
--- a/sm5/atacmds.cpp
+++ b/sm5/atacmds.cpp
@@ -36,7 +36,7 @@
 #include "extern.h"
 #include "utility.h"
 
-const char *atacmds_c_cvsid="$Id: atacmds.cpp,v 1.183 2007/02/23 20:44:00 chrfranke Exp $"
+const char *atacmds_c_cvsid="$Id: atacmds.cpp,v 1.184 2007/04/14 08:57:47 shattered Exp $"
 ATACMDS_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID SCSIATA_H_CVSID UTILITY_H_CVSID;
 
 // to hold onto exit code for atexit routine
@@ -700,7 +700,7 @@ int ataReadHDIdentity (int device, struct ata_identify_device *buf){
 
 #ifndef __NetBSD__
   // if machine is big-endian, swap byte order as needed
-  // (the NetBSD kernel does deliver the results in host byte order)
+  // NetBSD kernel delivers IDENTIFY data in host byte order
   if (isbigendian()){
     int i;
     
@@ -843,7 +843,7 @@ int ataReadSmartValues(int device, struct ata_smart_values *data){
   if (checksum((unsigned char *)data))
     checksumwarning("SMART Attribute Data Structure");
   
-  // byte swap if needed
+  // swap endian order if needed
   if (isbigendian()){
     int i;
     swap2((char *)&(data->revnumber));
@@ -895,7 +895,7 @@ int ataReadSelfTestLog (int device, struct ata_smart_selftestlog *data){
   if (con->fixfirmwarebug == FIX_SAMSUNG)
     fixsamsungselftestlog(data);
 
-  // fix endian order, if needed
+  // swap endian order if needed
   if (isbigendian()){
     int i;
     swap2((char*)&(data->revnumber));
@@ -1111,7 +1111,7 @@ int ataWriteSelectiveSelfTestLog(int device, struct ata_smart_values *sv, uint64
   cksum+=1;
   data->checksum=cksum;
 
-    // swap endian order if needed
+  // swap endian order if needed
   if (isbigendian()){
     swap2((char *)&(data->logversion));
     for (int i=0;i<5;i++){
@@ -1186,7 +1186,7 @@ int ataReadErrorLog (int device, struct ata_smart_errorlog *data){
   else if (con->fixfirmwarebug == FIX_SAMSUNG2)
     fixsamsungerrorlog2(data);
 
-  // Correct endian order if necessary
+  // swap endian order if needed
   if (isbigendian()){
     int i,j;
     
@@ -1219,7 +1219,7 @@ int ataReadSmartThresholds (int device, struct ata_smart_thresholds_pvt *data){
   if (checksum((unsigned char *)data))
     checksumwarning("SMART Attribute Thresholds Structure");
   
-  // byte swap if needed
+  // swap endian order if needed
   if (isbigendian())
     swap2((char *)&(data->revnumber));
 
diff --git a/sm5/ataprint.cpp b/sm5/ataprint.cpp
index fc504f0036a97c37e60aa0ab68cf2c01a45426d5..f402d1357cb711409b1118ac8251af5cf9525a09 100644
--- a/sm5/ataprint.cpp
+++ b/sm5/ataprint.cpp
@@ -41,7 +41,7 @@
 #include "utility.h"
 #include "knowndrives.h"
 
-const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.179 2007/04/05 18:23:29 shattered Exp $"
+const char *ataprint_c_cvsid="$Id: ataprint.cpp,v 1.180 2007/04/14 08:57:47 shattered Exp $"
 ATACMDNAMES_H_CVSID ATACMDS_H_CVSID ATAPRINT_H_CVSID CONFIG_H_CVSID EXTERN_H_CVSID INT64_H_CVSID KNOWNDRIVES_H_CVSID SMARTCTL_H_CVSID UTILITY_H_CVSID;
 
 // for passing global control variables
@@ -99,6 +99,7 @@ void format_ata_string(char *out, const char *in, int n)
 #ifndef __NetBSD__
   swapbytes(tmp, in, n);
 #else
+  /* NetBSD kernel delivers IDENTIFY data in host byte order (but all else is LE) */
   if (isbigendian())
     strncpy(tmp, in, n);
   else