diff --git a/inxi b/inxi
index 38fa5b1..aecdcb9 100755
--- a/inxi
+++ b/inxi
@@ -671,7 +671,8 @@ initialize_script_data()
 	else
 		error_handler 6
 	fi
-	if [[ -d /proc/acpi/battery ]];then
+	# found a case of battery existing but having nothing in it on desktop mobo
+	if [[ -n $( ls /proc/acpi/battery 2>/dev/null ) ]];then
 		B_LAPTOP='true'
 	fi
 	if [[ -e $FILE_CPUINFO ]]; then
@@ -3786,6 +3787,7 @@ get_machine_data()
 					gsub(/'"$BAN_LIST_NORMAL"'/, "", $0)
 					gsub(/,/, " ", $0)
 					sub(/To Be Filled By O.E.M.|Not Available|System manufacturer|System Product Name|System Version|N\/A|OEM|none/, "", $0)
+					sub(/http:\/\/www.abit.co.tw\//, "Abit", $0)
 					gsub(/^ +| +$/, "", $0)
 					gsub(/ [ \t]+/, " ", $0)
 					print $0