diff --git a/Resources/UpdateOfflineImap3.sh b/Resources/UpdateOfflineImap3.sh
index 48e838f..cc35ff6 100644
--- a/Resources/UpdateOfflineImap3.sh
+++ b/Resources/UpdateOfflineImap3.sh
@@ -1,7 +1,6 @@
 #!/bin/ash
 ##Script for updating OfflineIMAP3
 
-
 NewOfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 
 printf "OfflineIMAP: checking for upgrades... "
@@ -9,9 +8,11 @@ printf "OfflineIMAP: checking for upgrades... "
 if [ "$NewOfflineIMAPVer" != "$(cat /opt/OfflineIMAP3-installed)" ];
 then
     echo "update found"
-    curl https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.zip
-    unzip -q /tmp/olim3.zip -d /opt/OfflineIMAP3
-    sed -i -e '/kerberos/c\' -e '/cygwin/c\' /opt/OfflineIMAP3/requirements.txt
+    curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz
+    mkdir /opt/OfflineIMAP3
+    tar -C /opt/OfflineIMAP3 -xzf /tmp/olim3.tar.gz --strip 1 
+    sed -i '/kerberos/c\' /opt/OfflineIMAP3/requirements.txt
+    sed -i '/cygwin/c\' /opt/OfflineIMAP3/requirements.txt
     pip3 install -r /opt/OfflineIMAP3/requirements.txt
     echo $NewOfflineIMAPVer > /opt/OfflineIMAP3-installed
     echo " upgrade complete"
diff --git a/Resources/UpdateRainLoop.sh b/Resources/UpdateRainLoop.sh
index dabd0bd..bda6e9e 100644
--- a/Resources/UpdateRainLoop.sh
+++ b/Resources/UpdateRainLoop.sh
@@ -12,7 +12,7 @@ then
     rm -rf /opt/rainloop
     curl http://www.rainloop.net/repository/webmail/rainloop-community-latest.zip -o /tmp/rlcl.zip
     unzip -q /tmp/rlcl.zip -d /opt/rainloop
-    chown -R nginx:nginx  /var/www/rainloop
+    chown -R nginx:nginx  /opt/rainloop
     find /opt/rainloop/ -type d -exec chmod 755 {} \;
     find /opt/rainloop/ -type f -exec chmod 644 {} \;
     echo $NewRainLoopVer > /opt/rainloop-installed
diff --git a/install.sh b/install.sh
index 2fdcda7..9a8bf8e 100644
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@
 cd "$( dirname "$0" )"
 
 #Install required software 
-apk add dovecot php8-xml php8-fpm php8-curl py3-pip sudo curl openssl
+apk add dovecot php8-xml php8-fpm php8-curl php8-dom php8-iconv py3-pip sudo curl openssl
 
 #Install Nginx and Nginx Repo
 wget  https://nginx.org/keys/nginx_signing.rsa.pub -O /etc/apk/keys/nginx_signing.rsa.pub
@@ -14,10 +14,11 @@ apk add nginx@nginx
 #Configure Nginx
 rm -rf /etc/nginx/conf.d/*
 mv Configs/nginx.conf /etc/nginx/nginx.conf
+mkdir /var/www
 mv Resources/Custom-index.html /var/www/index.html
 
 #Configure Dovecot
-rm /etc/dovecot/*
+rm -rf /etc/dovecot/*
 mv Configs/dovecot.conf /etc/dovecot/dovecot.conf
 mkdir /mail
 chmod 777 /mail
@@ -36,16 +37,18 @@ mkdir -p /opt/rainloop/data/_data_/_default_/configs /opt/rainloop/data/_data_/_
 touch /opt/rainloop/data/_data_/_default_/domains/disabled
 mv Configs/RainLoop-application.ini /opt/rainloop/data/_data_/_default_/configs/application.ini
 mv Configs/RainLoop-Domain-localhost.ini /opt/rainloop/data/_data_/_default_/domains/localhost.ini
-chown -R nginx:nginx  /var/www/rainloop
-find /var/www/rainloop -type d -exec chmod 755 {} \;
-find /var/www/rainloop -type f -exec chmod 644 {} \;
+chown -R nginx:nginx  /opt/rainloop
+find /opt/rainloop -type d -exec chmod 755 {} \;
+find /opt/rainloop -type f -exec chmod 644 {} \;
 
 #Install OfflineIMAP3
 OfflineIMAPVer=$(curl -s https://api.github.com/repos/OfflineIMAP/offlineimap3/tags | grep 'name.*' |head -n 1 | cut -d : -f 2,3 | tr -d \" |tr -d , |tr -d " ")
 echo "$OfflineIMAPVer" > /opt/OfflineIMAP3-installed
-curl https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.zip
-unzip -q /tmp/olim3.zip -d /opt/OfflineIMAP3
-sed -i -e '/kerberos/c\' -e '/cygwin/c\' /opt/OfflineIMAP3/requirements.txt
+curl -L https://github.com/OfflineIMAP/offlineimap3/archive/refs/tags/$OfflineIMAPVer.tar.gz -o /tmp/olim3.tar.gz
+mkdir /opt/OfflineIMAP3
+tar -C /opt/OfflineIMAP3 -xzf /tmp/olim3.tar.gz --strip 1 
+sed -i '/kerberos/c\' /opt/OfflineIMAP3/requirements.txt
+sed -i '/cygwin/c\' /opt/OfflineIMAP3/requirements.txt
 pip3 install -r /opt/OfflineIMAP3/requirements.txt
 
 #Add OfflineIMAP config to user skeleton folder
@@ -57,4 +60,6 @@ echo '30      2       *       *       4      ash /opt/mailsync.sh > /dev/null' >
 #Add tool update scripts
 mv Resources/UpdateRainLoop.sh /opt/UpdateRainLoop.sh
 mv Resources/UpdateOfflineImap3.sh /opt/UpdateOfflineImap3.sh
-mv Resources/AddMailBox.sh /opt/AddMailBox.sh
\ No newline at end of file
+mv Resources/AddMailBox.sh /opt/AddMailBox.sh
+#Cleanup
+rm -f /tmp/olim3.tar.gz /tmp/rlcl.zip
\ No newline at end of file