diff --git a/inxi b/inxi
index dc994e2..8d188eb 100755
--- a/inxi
+++ b/inxi
@@ -1849,8 +1849,8 @@ get_graphics_glx_data()
 		function join(arr, sep) {
 			s=""
 			i=flag=0
-			for (i in arr) {
-				if (flag++) {
+			for ( i in arr ) {
+				if ( flag++ ) {
 					s = s sep
 				}
 				s = s i
@@ -1862,9 +1862,9 @@ get_graphics_glx_data()
 			IGNORECASE=1
 		}
 		/opengl renderer/ {
-			if ($2 ~ /mesa/) {
+			if ( $2 ~ /mesa/ ) {
 				# Allow r300 et al, but not the rest
-				if ($2 ~ / r[3-9][0-9][0-9] /) {
+				if ( $2 ~ / r[3-9][0-9][0-9] / ) {
 					a[$2]
 					f++
 				}
@@ -1872,7 +1872,7 @@ get_graphics_glx_data()
 			}
 			$2 && a[$2]
 		}
-		/opengl version/ && (f || $2 !~ /mesa/) {
+		/opengl version/ && ( f || $2 !~ /mesa/ ) {
 			$2 && b[$2]
 		}
 		/direct rendering/ {
@@ -2444,6 +2444,8 @@ get_partition_data_advanced()
 					partition = ""
 					partTemp = ""
 				}
+				# trying to handle space in name
+				gsub( /\\040/, " ", $0 )
 				/[ \t]'$mount_point'[ \t]/ && $1 != "rootfs" {
 					# initialize the variables
 					label = ""
@@ -2512,6 +2514,9 @@ get_partition_data_advanced()
 					}' )
 			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