diff --git a/components/thunderlinkCommandLineHandler.js b/components/thunderlinkCommandLineHandler.js
index bfdf60b..5d1e45d 100755
--- a/components/thunderlinkCommandLineHandler.js
+++ b/components/thunderlinkCommandLineHandler.js
@@ -144,6 +144,7 @@ var thunderlinkCommandLineHandler = {
     return this.QueryInterface(iid);
   },
 
+  // Use ChromeUtils instead of XPCOMUtils here and line 154 for TB64+ (or earlier?)
   QueryInterface: XPCOMUtils.generateQI([Ci.nsICommandLineHandler, Ci.nsIClassInfo, Ci.nsIFactory]),
 };
 
diff --git a/makeXpi.sh b/makeXpi.sh
index 63249cc..396fba8 100755
--- a/makeXpi.sh
+++ b/makeXpi.sh
@@ -2,7 +2,9 @@ if [ -n "$1" ]; then
     rm thunderlink-$1-tb.xpi
     perl -p -i -e "s/version>.+</version>$1</" install.rdf
     perl -p -i -e "s/\"version\"\: \".*\"/\"version\"\: \"$1\"/" manifest.json
+    # Switch these two lines for TB64+ (or earlier?)
     zip -r thunderlink-$1-tb.xpi chrome/* chrome.manifest components/* CREDITS defaults/* install.rdf LICENSE README.md
+    #zip -r thunderlink-$1-tb.xpi chrome/* manifest.json chrome.manifest components/* CREDITS defaults/* install.rdf LICENSE README.md
 else
     echo "Please give me a version!"
 fi