diff --git a/Mac/scripts/findgremlins.py b/Mac/scripts/findgremlins.py
index 595551e..3569c77 100644
--- a/Mac/scripts/findgremlins.py
+++ b/Mac/scripts/findgremlins.py
@@ -5,7 +5,7 @@
 By Just, with a little glue by Jack"""
 
 import EasyDialogs
-import macfs
+import MacOS
 import re
 import os
 import string
@@ -20,8 +20,8 @@
 				path = os.path.join(top, name)
 				walk(path)
 	else:
-		cr, tp = macfs.FSSpec(top).GetCreatorType()
-		if tp == 'TEXT' and top[-4:] <> ".hqx":
+		cr, tp = MacOS.GetCreatorAndType(top)
+		if tp in ('TEXT', '\0\0\0\0') and top[-4:] <> ".hqx":
 			data = open(top).read()
 			badcount = 0
 			for ch in data[:256]:
@@ -44,11 +44,14 @@
 				pos = j
 
 def main():
-	pathname = EasyDialogs.AskFolder()
-	if pathname:
-		walk(pathname)
+	if sys.argv[1:]:
+		for pathname in sys.argv[1:]:
+			walk(pathname)
+	else:
+		pathname = EasyDialogs.AskFolder()
+		if pathname:
+			walk(pathname)
 		
 if __name__ == '__main__':
 	main()
-	sys.exit(1) # So we see the output