diff --git a/NAS_mounts/auto_nas b/NAS_mounts/auto_nas
index f5784af..76d4c73 100755
--- a/NAS_mounts/auto_nas
+++ b/NAS_mounts/auto_nas
@@ -1,4 +1,4 @@
-/Users/[[UNAME]]/mnt/music -fstype=smbfs ://[[USERNAME]]:[[PASSWORD]]@nas.loven/music
-/Users/[[UNAME]]/mnt/video -fstype=smbfs ://[[USERNAME]]:[[PASSWORD]]@nas.loven/video
-/Users/[[UNAME]]/mnt/photo -fstype=smbfs ://[[USERNAME]]:[[PASSWORD]]@nas.loven/photo
-/Users/[[UNAME]]/mnt/NAS   -fstype=smbfs ://[[USERNAME]]:[[PASSWORD]]@nas.loven/home
+/Users/[[UNAME]]/mnt/music -fstype=smbfs,soft ://[[USERNAME]]:[[PASSWORD]]@nas.loven/music
+/Users/[[UNAME]]/mnt/video -fstype=smbfs,soft ://[[USERNAME]]:[[PASSWORD]]@nas.loven/video
+/Users/[[UNAME]]/mnt/photo -fstype=smbfs,soft ://[[USERNAME]]:[[PASSWORD]]@nas.loven/photo
+/Users/[[UNAME]]/mnt/NAS   -fstype=smbfs,soft ://[[USERNAME]]:[[PASSWORD]]@nas.loven/home
diff --git a/NAS_mounts/fix_mounts.sh b/NAS_mounts/fix_mounts.sh
index 969153f..1419a23 100644
--- a/NAS_mounts/fix_mounts.sh
+++ b/NAS_mounts/fix_mounts.sh
@@ -46,7 +46,7 @@ do
 			/usr/bin/sudo /sbin/umount $full_mount 
 			# if resource is busy force unmount with diskutil DANGER
 			if [ ! $? ]; then /usr/sbin/diskutil unmount force $full_mount; fi
-	        /usr/bin/sudo -u $mnt_usr cd $full_mount 
+			/usr/bin/sudo -u $mnt_usr cd $full_mount 
 		fi
 	else
 		echo "fix_mounts [$d] Not mounted: $full_mount - ignoring"
diff --git a/NAS_mounts/setup.sh b/NAS_mounts/setup.sh
index 882affb..b77bc00 100755
--- a/NAS_mounts/setup.sh
+++ b/NAS_mounts/setup.sh
@@ -36,7 +36,7 @@ function main()
 
   # Add reference to the new file to /etc/auto_master
   if ! grep "${auto_file}" < /etc/auto_master >/dev/null; then
-    echo "/- ${auto_file} -nosuid" \
+    echo "/- ${auto_file}" \
       | sudo tee -a /etc/auto_master \
       > /dev/null
   fi