diff --git a/unit6_fix_sp24.sh b/unit6_fix_sp24.sh
index a815de6..ad27244 100755
--- a/unit6_fix_sp24.sh
+++ b/unit6_fix_sp24.sh
@@ -5,20 +5,7 @@ none='\033[0m'
 yellow='\033[1;33m'
 bold='\033[1m'
 
-##########################################
-############### REFERENCES ###############
-##
-## CATALYST LOCAL INSTALL:
-##  https://catalyst-soar.com/docs/catalyst/admin/install/#local-installation
-##
-## DOCKER COMPOSE STANDALONE 
-##  https://docs.docker.com/compose/install/standalone/
-##
-## DOCKER 
-##  https://github.com/fmidev/smartmet-server/blob/master/docs/Setting-up-Docker-and-Docker-Compose-(Ubuntu-16.04-and-18.04.1).md
-##
-## Script developed by rollingcoconut and sarcb 
-##########################################
+export DEBIAN_FRONTEND=noninteractive
 
 echo "[UNIT 6 LAB/PROJECT SPRING 2024 FIX] Starting script..."
 
@@ -42,38 +29,73 @@ CATALYST_INSTALL_PATH=/opt/catalyst
 mkdir -p $CATALYST_INSTALL_PATH
 pushd $CATALYST_INSTALL_PATH
 
-#### CATALYST LOCAL INSTALL: UPDATE /ETC/HOSTS
+# Update /etc/hosts
 if ! grep -q "catalyst.localhost" /etc/hosts; then
     echo "127.0.0.1 catalyst.localhost" | sudo tee -a /etc/hosts
     echo "127.0.0.1 authelia.localhost" | sudo tee -a /etc/hosts
 fi
 
-#### DOCKER-COMPOSE INSTALL
-DOCKER_COMPOSE_INSTALLED=$(docker-compose --version)
+# Check and remove existing Docker Compose
+DOCKER_COMPOSE_INSTALLED=$(docker-compose --version 2>/dev/null || true)
 if [[ "$DOCKER_COMPOSE_INSTALLED" =~ "Docker Compose version" ]]; then
-    echo -e "${green}[DOCKER-COMPOSE SETUP]${none} docker-compose is already installed."
+    echo -e "${yellow}[DOCKER-COMPOSE UNINSTALL]${none} Removing existing Docker Compose installation..."
+    sudo rm -f /usr/local/bin/docker-compose
+    sudo rm -f /usr/bin/docker-compose
+    echo -e "${green}[DOCKER-COMPOSE UNINSTALL]${none} Existing Docker Compose removed."
+fi
+
+# Docker Compose Setup (architecture-specific)
+echo -e "${yellow}[DOCKER-COMPOSE SETUP]${none} INSTALLING DOCKER-COMPOSE"
+ARCH=$(uname -m)
+if [[ "$ARCH" == "aarch64" ]]; then
+    COMPOSE_ARCH="arm64"
+elif [[ "$ARCH" == "x86_64" ]]; then
+    COMPOSE_ARCH="x86_64"
 else
-    echo -e "${yellow}[DOCKER-COMPOSE SETUP]${none} INSTALLING DOCKER-COMPOSE"
-    sudo curl -SL https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-x86_64 -o /usr/local/bin/docker-compose
-    sudo ln -s /usr/local/bin/docker-compose /usr/bin/docker-compose
-    sudo chmod +x /usr/local/bin/docker-compose
-    sudo /usr/local/bin/docker-compose
+    echo -e "${red}[DOCKER-COMPOSE]${none} Unsupported architecture: $ARCH"
+    exit 1
 fi
 
-#### CATALYST LOCAL INSTALL: DOCKER
-DOCKER_ACTIVE=$(systemctl is-active docker)
-if [[ "$DOCKER_ACTIVE" == "active" ]]; then
-    echo -e "${green}[DOCKER SETUP]${none} Docker is already installed."
+sudo curl -SL "https://github.com/docker/compose/releases/download/v2.24.6/docker-compose-linux-${COMPOSE_ARCH}" -o /usr/local/bin/docker-compose
+sudo ln -sf /usr/local/bin/docker-compose /usr/bin/docker-compose
+sudo chmod +x /usr/local/bin/docker-compose
+sudo /usr/local/bin/docker-compose
+
+# Docker Setup
+echo -e "${yellow}[DOCKER SETUP]${none} INSTALLING DOCKER"
+ARCHITECTURE=$(dpkg --print-architecture)
+echo "deb [arch=${ARCHITECTURE}] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list
+sudo curl --show-error --location https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
+sudo apt-get update -y
+sudo apt-get install -y docker-ce
+sudo usermod -aG docker ${USER}
+
+# Docker socket activation fix
+echo -e "${yellow}[DOCKER FIX]${none} Ensuring docker.socket is running..."
+sudo systemctl enable docker.socket
+sudo systemctl start docker.socket
+
+# Patch docker.service to disable socket activation
+DOCKER_SERVICE_FILE="/lib/systemd/system/docker.service"
+if grep -q "fd://" "$DOCKER_SERVICE_FILE"; then
+    echo -e "${yellow}[DOCKER FIX]${none} Patching docker.service to remove socket activation..."
+    sudo sed -i 's|ExecStart=/usr/bin/dockerd .*|ExecStart=/usr/bin/dockerd|' "$DOCKER_SERVICE_FILE"
+    sudo systemctl daemon-reexec
+    sudo systemctl daemon-reload
+    sudo systemctl restart docker
 else
-    echo -e "${yellow}[DOCKER SETUP]${none} INSTALLING DOCKER"
-    sudo curl --show-error --location https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
-    sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-    sudo apt-get update
-    sudo apt-get install -y docker-ce
-    sudo usermod -aG docker ${USER}
+    echo -e "${green}[DOCKER FIX]${none} docker.service already patched."
 fi
 
-#### Check if apache2 is running
+# Confirm Docker is active
+if systemctl is-active --quiet docker; then
+    echo -e "${green}[DOCKER]${none} Docker daemon is running."
+else
+    echo -e "${red}[DOCKER]${none} Docker failed to start. Please check system logs."
+    exit 1
+fi
+
+# Apache2 check
 APACHE2_ACTIVE=$(systemctl is-active apache2)
 if [[ "$APACHE2_ACTIVE" == "active" ]]; then
     echo -e "${yellow}[APACHE2]${none} DISABLING APACHE2"
@@ -83,7 +105,7 @@ else
     echo -e "${green}[APACHE2]${none} Apache2 is already disabled."
 fi
 
-#### Check if nginx is running
+# NGINX check
 NGINX_ACTIVE=$(systemctl is-active nginx)
 if [[ "$NGINX_ACTIVE" == "active" ]]; then
     echo -e "${yellow}[NGINX]${none} Stopping NGINX"
@@ -92,7 +114,7 @@ else
     echo -e "${green}[NGINX]${none} Nginx is already stopped."
 fi
 
-#### CATALYST LOCAL INSTALL: CATALYST
+# Catalyst Docker check
 CATALYST_INSTALLED=$(docker compose ls -q --filter name=catalyst-setup-sp24-main)
 if [ -n "$CATALYST_INSTALLED" ]; then
     echo -e "${green}[CATALYST SETUP]${none} Catalyst is already running.  Try connecting at https://catalyst.localhost"
@@ -102,7 +124,6 @@ if [ -n "$CATALYST_INSTALLED" ]; then
     echo -e "\n  ${bold}docker compose -f /opt/catalyst/catalyst-setup-sp24-main/docker-compose.yml up --detach${none}\n"
     exit 0
 else
-    # verify that this is the first install to prevent arangodb root password issues
     if [ -n "$(docker volume ls -q --filter name=catalyst-setup-sp24-main_arangodb)" ]; then
         echo "${yellow}[CATALYST SETUP]${none} Catalyst seems to already be installed, but is not currently running."
         echo -e "\nTo ${green}start${none} it, use the following command:"
@@ -114,11 +135,11 @@ else
         echo -e "${yellow}[CATALYST SETUP]${none} INSTALLING CATALYST"
         curl -sL https://raw.githubusercontent.com/sarcb/catalyst-setup-sp24/main/install_catalyst.sh -o install_catalyst.sh
         openssl req -x509 -newkey rsa:4096 -sha256 -days 3650 -nodes -keyout example.key -out example.crt -subj "/CN=localhost"
-        sudo bash install_catalyst.sh https://catalyst.localhost https://authelia.localhost $CATALYST_INSTALL_PATH/example.crt $CATALYST_INSTALL_PATH/example.key admin:admin:admin@example.com
+        yes | sudo bash install_catalyst.sh https://catalyst.localhost https://authelia.localhost $CATALYST_INSTALL_PATH/example.crt $CATALYST_INSTALL_PATH/example.key admin:admin:admin@example.com
     fi
 fi
 
-#### VERIFY
+# Final check
 CATALYST_INSTALLED=$(docker compose ls -q --filter name=catalyst-setup-sp24-main)
 if [ -n "$CATALYST_INSTALLED" ]; then
     echo -e "${green}[CATALYST SETUP]${none} Catalyst is running.  Try connecting at https://catalyst.localhost"
@@ -126,9 +147,7 @@ else
     echo -e "${red}[CATALYST SETUP]${none} Catalyst is not running.  Please check the logs for errors."
 fi
 
-### CLEANUP 
-if [[ $PWD != $CATALYST_INSTALL_PATH  ]]; then 
+# Cleanup
+if [[ $PWD != $CATALYST_INSTALL_PATH ]]; then 
     popd
 fi
-
-