diff --git a/copy_firefox_data.sh b/copy_firefox_data.sh
index 1cab5aa..52c732b 100755
--- a/copy_firefox_data.sh
+++ b/copy_firefox_data.sh
@@ -9,8 +9,7 @@
 #
 
 epoch=$( date +%Y%m%d%H%M );
-#server=10.25.0.1
-server=treehouse.org.za
+server=10.25.0.1
 backups=~/Downloads/firefox
 
 copy() {
@@ -30,7 +29,9 @@ if  [ -x ~/bin/firefox_tabgroups_export.py ]; then
     if [ -f ${previous} ]; then
         if diff -q ${previous} ${backups}/tabs/firefox_tabs.${epoch} >/dev/null; then
             # No difference, remove this file
-            rm ${backups}/tabs/firefox_tabs.${epoch}
+            if [ ${previous} != ${backups}/tabs/firefox_tabs.${epoch} ]; then
+                rm ${backups}/tabs/firefox_tabs.${epoch}
+            fi
         else
             do_copy=1
         fi
@@ -38,10 +39,10 @@ if  [ -x ~/bin/firefox_tabgroups_export.py ]; then
         do_copy=1
     fi
 
-    # Delete backups older than $time
+    # Delete backups older than a year
     find ${backups}/tabs -ctime +365 -delete
 
-    if [ ${do_copy} ]; then
+    if [ ${do_copy} -gt 0 ]; then
         for session in ~/.mozilla/firefox/*/sessionstore*/*; do
             sessionfile=$( basename ${session} )
             cp ${session} ${backups}/tabs/sessionstore/${epoch}_${sessionfile}
@@ -54,11 +55,13 @@ if [ -x ~/bin/firefox_decrypt.py ]; then
     do_copy=0
     mkdir -p ${backups}/passwords
     previous=$( ls ${backups}/passwords/firefox_passwords.*  | tail -1 )
-    echo '' | ~/bin/firefox_decrypt.py > ${backups}/passwords/firefox_passwords.${epoch}
+    echo '' | ~/bin/firefox_decrypt.py > ${backups}/passwords/firefox_passwords.${epoch} 2>/dev/null
     if [ -f ${previous} ]; then
         if diff -q ${previous} ${backups}/passwords/firefox_passwords.${epoch} >/dev/null; then
             # No difference, remove this file
-            rm ${backups}/passwords/firefox_passwords.${epoch}
+            if [ ${previous} != ${backups}/passwords/firefox_passwords.${epoch} ]; then
+                rm ${backups}/passwords/firefox_passwords.${epoch}
+            fi
         else
             do_copy=1
         fi
@@ -66,10 +69,10 @@ if [ -x ~/bin/firefox_decrypt.py ]; then
         do_copy=1
     fi
 
-    # Delete backups older than $time
+    # Delete backups older than a day
     find ${backups}/passwords -ctime +1 -delete
 
-    if [ ${do_copy} ]; then
+    if [ ${do_copy} -gt 0 ]; then
         ln -srf ${backups}/passwords/firefox_passwords.${epoch} ${backups}/passwords/firefox_passwords
         copy ${backups}/passwords
     fi