diff --git a/build.sh b/build.sh
index 2af9717..73be953 100755
--- a/build.sh
+++ b/build.sh
@@ -77,12 +77,12 @@ zip -0 -r $JAR_FILE `cat files`
 #cp --verbose --parents `cat files` $TMP_DIR/chrome
 
 # prepare components and defaults
-echo "Copying various files to $TMP_DIR folder..."
+echo "Copying various files from $ROOT_DIRS to $TMP_DIR folder..."
 for DIR in $ROOT_DIRS; do
   mkdir $TMP_DIR/$DIR
   FILES="`find $DIR -path '*CVS*' -prune -o -type f -print | grep -v \~`"
   echo $FILES >> files
-  cp -v $FILES $TMP_DIR
+  cp -Rv $DIR $TMP_DIR
 done
 
 # Copy other files to the root of future XPI.
@@ -102,8 +102,9 @@ if [ -f "chrome.manifest" ]; then
   #s/^(skin|locale)(\s+\S*\s+\S*\s+)(.*\/)$/\1\2jar:chrome\/$APP_NAME\.jar!\/\3/
   #
   # Then try this! (Same, but with characters escaped for bash :)
-  sed -i -r s/^\\\(content\\s+\\S*\\s+\\\)\\\(\\S*\\/\\\)$/\\1jar:chrome\\/$APP_NAME-$VERSION\\.jar!\\/\\2/ chrome.manifest
-  sed -i -r s/^\\\(skin\|locale\\\)\\\(\\s+\\S*\\s+\\S*\\s+\\\)\\\(.*\\/\\\)$/\\1\\2jar:chrome\\/$APP_NAME-$VERSION\\.jar!\\/\\3/ chrome.manifest
+  sed -E -i.bak 's/^(content[[:space:]]+[^[:space:]]*[[:space:]]+)([^[:space:]]*\/)[[:space:]]*$/\1jar:chrome\/'$APP_NAME-$VERSION'\.jar!\/\2/' chrome.manifest
+  sed -E -i.bak 's/^(skin|locale)([[:space:]]+[^[:space:]]*[[:space:]]+[^[:space:]]*[[:space:]]+)(.*\/)[[:space:]]*$/\1\2jar:chrome\/'$APP_NAME-$VERSION'\.jar!\/\3/' chrome.manifest
+  rm chrome.manifest.bak
 
   # (it simply adds jar:chrome/whatever.jar!/ at appropriate positions of chrome.manifest)
 fi
diff --git a/chrome/content/accountProvisioner.js b/chrome/content/accountProvisioner.js
index 92fcec4..5ac1ca9 100644
--- a/chrome/content/accountProvisioner.js
+++ b/chrome/content/accountProvisioner.js
@@ -85,9 +85,9 @@ function saveState() {
  **/
 function objectify(inputs) {
   var rv = {}
-  inputs.each(function(index, value) {
-    var key = $(value).attr("name").split(".");
-    var value = $(value).attr("value");
+  inputs.each(function(index, input) {
+    var key = $(input).attr("name").split(".");
+    var value = $(input).attr("value");
     var obj = rv;
     for (var i in key) {
       var part = key[i];
diff --git a/install.rdf b/install.rdf
index c7c9ffb..4c8bf06 100644
--- a/install.rdf
+++ b/install.rdf
@@ -4,7 +4,7 @@
     <em:id>accountprovisioner@latte.ca</em:id>
     <em:type>2</em:type>
     <em:name>AccountProvisioner</em:name>
-    <em:version>0.6</em:version>
+    <em:version>0.7</em:version>
     <em:creator>Blake Winton</em:creator>
     <em:contributor>Bryan Clark</em:contributor>
     <em:description>An extension that will allow you to create an account at a major email provider</em:description>