diff --git a/inxi b/inxi
index 5998f14..8ffeee8 100755
--- a/inxi
+++ b/inxi
@@ -4570,8 +4570,8 @@ sub show_options {
 	resolution; hz; dpi; size; diagonal. See man for explanations." ],
 	['2', '-j,-p,-P', '', "For swap (if available): swappiness and vfs cache 
 	pressure, and if values are default or not." ],
-	['2', '-p,-P', '', "If available: raw size of partition, percent available for user, 
-	block size of file system (root required)." ],
+	['2', '-p,-P', '', "If available: raw size of ${partition_string}s, 
+	percent available for user, block size of file system (root required)." ],
 	['2', '-S', '', "If available: kernel boot parameters." ],
 	['1', '-A', '--audio', "Audio/sound card(s), driver, sound server." ],
 	['1', '-b', '--basic', "Basic output, short form. Same as $self_name^-v^2." ],
@@ -4593,7 +4593,8 @@ sub show_options {
 	['1', '-d', '--disk-full, --optical', "Optical drive data (and floppy disks, 
 	if present). Triggers -D." ],
 	['1', '-D', '--disk', "Hard Disk info, including total storage and details 
-	for each disk. Disk total used percentage includes swap partition size(s)." ],
+	for each disk. Disk total used percentage includes swap ${partition_string}
+	size(s)." ],
 	['1', '-f', '--flags', "All CPU $flags. Triggers -C. Not shown with -F to 
 	avoid spamming." ],
 	['1', '-F', '--full', "Full output. Includes all Upper Case line letters 
@@ -4607,7 +4608,7 @@ sub show_options {
 	You shouldn't paste your local/WAN IP." ],
 	['1', '-I', '--info', "General info, including processes, uptime, memory, 
 	IRC client or shell type, $self_name version." ],
-	['1', '-j', '--swap', "Swap in use. Includes partitions, zram, file." ],
+	['1', '-j', '--swap', "Swap in use. Includes ${partition_string}s, zram, file." ],
 	['1', '-J', '--usb', "Show USB data: Hubs and Devices." ],
 	['1', '-l', '--label', "$partition_string_u labels. Triggers -P. 
 	For full -p output, use -pl." ],
@@ -4633,8 +4634,9 @@ sub show_options {
 	['1', '-p', '--partitions-full', "Full $partition_string information (-P plus all other 
 	detected ${partition_string}s)." ],
 	['1', '-P', '--partitions', "Basic $partition_string info. Shows, if detected: 
-	/ /boot /home /opt /tmp /usr /usr/home /var /var/log /var/tmp. Swap partitions
-	show if --swap is not used. Use -p to see all mounted ${partition_string}s." ],
+	/ /boot /home /opt /tmp /usr /usr/home /var /var/log /var/tmp. Swap 
+	${partition_string}s show if --swap is not used. Use -p to see all 
+	mounted ${partition_string}s." ],
 	['1', '-r', '--repos', "Distro repository data. Supported repo types: APK, 
 	APT, CARDS, EOPKG, PACMAN, PACMAN-G2, PISI, PORTAGE, PORTS (BSDs), SLACKPKG,
 	TCE, URPMQ, XBPS, YUM/ZYPP." ],
@@ -4803,10 +4805,12 @@ sub show_options {
 	settings or actual widths. Example:^inxi^-y^130" ],
 	['1', '-z', '--filter', "Adds security filters for IP/MAC addresses, serial numbers, 
 	location (-w), user home directory name, host item. Default on for IRC clients." ],
-	['1', '', '--filter-label', "Filters out partition labels in -j, -o, -p, -P, -Sa." ],
+	['1', '', '--filter-label', "Filters out ${partition_string} labels in -j, 
+	-o, -p, -P, -Sa." ],
 	['1', '-Z', '--filter-override', "Override for output filters. Useful for 
 	debugging networking issues in IRC, for example." ],
-	['1', '', '--filter-uuid', "Filters out partition UUIDs in -j, -o, -p, -P, -Sa." ],
+	['1', '', '--filter-uuid', "Filters out ${partition_string} UUIDs in -j, 
+	-o, -p, -P, -Sa." ],
 	[0, '', '', "$line" ],
 	[0, '', '', "Additional Options:" ],
 	['1', '-h', '--help', "This help menu." ],
@@ -4878,7 +4882,7 @@ sub show_options {
 	if not screen." ],
 	['1', '', '--output-file', "[Full filepath|print] Output file to be used for --output." ],
 	['1', '', '--partition-sort', "[dev-base|fs|id|label|percent-used|size|uuid|used] 
-	Change sort order of partition output. See man page for specifics." ],
+	Change sort order of ${partition_string} output. See man page for specifics." ],
 	['1', '', '--sleep', "[0-x.x] Change CPU sleep time, in seconds, for -C 
 	(default:^$cpu_sleep). Allows system to catch up and show a more accurate CPU 
 	use. Example:^$self_name^-Cxxx^--sleep^0.15" ],