diff -uNr sensor-1.8.orig/install_sensor sensor-1.8/install_sensor
--- sensor-1.8.orig/install_sensor	Fri May  2 15:43:32 2003
+++ sensor-1.8/install_sensor	Sat May  3 00:41:45 2003
@@ -25,7 +25,7 @@
 GZIPPROG=`which gzip 2>/dev/null` || GZIPPROG=gzip
 SSHD=`which sshd 2>/dev/null` || SSHD=sshd
 CRONTAB=`which crontab 2>/dev/null` || CRONTAB=crontab
-NTPDATE=`which ntpdate 2>/dev/null` ||NTPDATE=ntpdate
+NTPDATE=`which ntpdate 2>/dev/null` || NTPDATE=ntpdate
 
 # Optional program locations
 MERGECAP=`which mergecap 2>/dev/null` || MERGECAP=mergecap
@@ -107,9 +107,9 @@
 	fi
 done
 
-# Make certain varaibles available to perl functions below:
+# Make certain variables available to perl functions below:
 export SNIFFER_BIN GZIPPROG MERGER SHIAS_USER LOGDIR SENSOR_PATH OSFAM
-                                   
+
 # Create the SENSOR_PATH"
 echo -en "Checking for $SENSOR_PATH:\t"
 if [ ! -d $SENSOR_PATH ] 
@@ -120,7 +120,7 @@
 # Create the shadow user
 
 echo -en "Looking for the $SHIAS_USER account:\t"
-if grep $SHIAS_USER /etc/passwd >/dev/null 2>&1 
+if grep "^$SHIAS_USER:" /etc/passwd >/dev/null 2>&1 
 	then echo "Account $SHIAS_USER exists. Not creating."
 else echo Creating
 
@@ -135,7 +135,7 @@
 fi
 
 echo -en "Confirming the $SHIAIS_USER home directory:\t"
-SH_HOMEDIR=`grep $SHIAS_USER /etc/passwd | awk -F: '{print $6}'` 
+SH_HOMEDIR=`grep "^$SHIAS_USER:" /etc/passwd | awk -F: '{print $6}'` 
 if [ -d $SH_HOMEDIR ]
     then echo "Good"
     echo -en "Creating $SHIAS_USER .ssh directory and setting permissions:\t"
diff -uNr sensor-1.8.orig/sensor_driver.in sensor-1.8/sensor_driver.in
--- sensor-1.8.orig/sensor_driver.in	Thu May  1 17:31:06 2003
+++ sensor-1.8/sensor_driver.in	Sat May  3 00:49:01 2003
@@ -93,7 +93,7 @@
 
 #
 # Set an appropriate umask so that the shadowias user account, via ssh from the
-# analyzer, can read & delete files during fetechem & cleanup operations.
+# analyzer, can read & delete files during fetchem & cleanup operations.
 #
 
     umask 077;