diff --git a/Makefile b/Makefile
index 8e84e79..fd4f2fb 100644
--- a/Makefile
+++ b/Makefile
@@ -217,12 +217,12 @@ checkinstall: version
 		--pkgrelease=1 \
 		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
 		--maintainer="$(SIGNER)" \
-		--requires="firefox,wget,i2p,i2p-router" \
+		--requires="firefox,wget" \
 		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
 		--nodoc \
 		--deldoc=yes \
 		--deldesc=yes \
 		--backup=no
 
-su3: jpackage
+su3: distclean jpackage
 	su3-tools -name "I2P-Profile-Installer-$(PROFILE_VERSION)" -signer "$(SIGNER)" -version "$(I2P_VERSION)"
diff --git a/README.md b/README.md
index 246278e..91e5609 100644
--- a/README.md
+++ b/README.md
@@ -127,9 +127,9 @@ End-to-End Windows build process using WSL
 with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
 your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
 environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
-Cygwin installed. You must have `NSIS.exe` installed and available on your `%PATH%`.
-You must have Git for Windows installed. When installing git for Windows, you should
-select "Checkout as is, commit as is" and leave line-endings alone.
+Cygwin installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows,
+you should select "Checkout as is, commit as is" and leave line-endings alone.
 
  1. [Set up Windows Subsystem for Linux per Microsoft's instructions](https://docs.microsoft.com/en-us/windows/wsl/install-win10#manual-installation-steps)
  2. [Install Ubuntu Focal per Microsoft's instructions](https://www.microsoft.com/store/apps/9n6svws3rx71)
@@ -163,8 +163,8 @@ End-to-End Windows build process using Cygwin
 with your `%JAVA_HOME%` environment variable configured and `%JAVA_HOME%/bin` on
 your `%PATH%`. You need to have Apache Ant installed and configured with `%ANT_HOME%`
 environment variable configured and `%ANT_HOME%/bin` on your `%PATH%`. You must have
-Cygwin installed. You must have `NSIS.exe` installed and available on your `%PATH%`.
-You must have Git for Windows installed. When installing git for Windows, you should
+WSL and git bash installed. You must have `NSIS.exe` installed and `makensis` available on your
+`%PATH%`. You must have Git for Windows installed. When installing git for Windows, you should
 select "Checkout as is, commit as is" and leave line-endings alone.
 
 TODO: Add links to the respective instructions for each of these.
diff --git a/src/unix/desktop/i2pconfig.desktop b/src/unix/desktop/i2pconfig.desktop
index a40c145..db8d3b8 100644
--- a/src/unix/desktop/i2pconfig.desktop
+++ b/src/unix/desktop/i2pconfig.desktop
@@ -3,7 +3,7 @@ Encoding=UTF-8
 Version=1.0
 Type=Application
 Terminal=false
-Exec=/usr/local/bin/i2psite
-Name=Edit I2P Site
-Categories=Network;
+Exec=/usr/local/bin/i2pconfig
+Name=I2P Configuration
+Categories=Network;WebBrowser;
 Icon=/var/lib/i2pbrowser/icons/ui2pbrowser_icon.ico
\ No newline at end of file
diff --git a/src/unix/i2pbrowser.sh b/src/unix/i2pbrowser.sh
index b46528e..41766ad 100755
--- a/src/unix/i2pbrowser.sh
+++ b/src/unix/i2pbrowser.sh
@@ -5,11 +5,7 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
 fi
 
 if [ ! -z $I2PROUTER ]; then
-  echo "$I2PROUTER" "$I2PCOMMAND"
-  http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || "$I2PROUTER" "$I2PCOMMAND"
-else if [ -d "I2P/bin" ]; then
-  http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || ./I2P/bin/I2P; \
-  echo "running the jpackaged I2P router since we can't find another one to use."
+  "$I2PROUTER" start
 fi
 
 if [ -z $BROWSING_PROFILE ]; then
@@ -19,8 +15,6 @@ fi
 if [ ! -d "$BROWSING_PROFILE" ]; then
   mkdir -p "$BROWSING_PROFILE" 
   cp -vr /var/lib/i2pbrowser/profile/* "$BROWSING_PROFILE" 
-else
-  cp -vr /var/lib/i2pbrowser/profile/extensions/* "$BROWSING_PROFILE/extensions"
 fi
 
 if [ ! -f "$BROWSING_PROFILE/user.js" ]; then
diff --git a/src/unix/i2pbrowserdebianrc b/src/unix/i2pbrowserdebianrc
index d2248bf..d7cb161 100644
--- a/src/unix/i2pbrowserdebianrc
+++ b/src/unix/i2pbrowserdebianrc
@@ -1,29 +1,17 @@
 
 I2PROUTER=$(which i2prouter)
-I2PCOMMAND="start"
 
 if [ -z $I2PROUTER ]; then
   I2PROUTER=/usr/sbin/i2prouter
-  I2PCOMMAND="start"
-fi
-
-if [ ! -f $I2PROUTER ]; then
-  I2PROUTER="/opt/i2p/bin/I2P"
-  I2PCOMMAND=""
 fi
 
 if [ ! -f $I2PROUTER ]; then
   I2PROUTER="$HOME/i2p/i2prouter"
-  I2PCOMMAND="start"
 fi
 
 if [ ! -f $I2PROUTER ]; then
   I2PROUTER=""
-  I2PCOMMAND=""
-  echo "no i2prouter detected"
 fi
 
-
-
-wget -q -O - "http://localhost:7657" >/dev/null  && I2PROUTER="" && I2PCOMMAND=""
-echo command: "$I2PROUTER" "$I2PCOMMAND"
\ No newline at end of file
+wget -q -O - "http://localhost:7657" >/dev/null  && I2PROUTER=""
+echo "$I2PROUTER"
\ No newline at end of file
diff --git a/src/unix/i2pconfig.sh b/src/unix/i2pconfig.sh
index fd568b4..4e19bae 100755
--- a/src/unix/i2pconfig.sh
+++ b/src/unix/i2pconfig.sh
@@ -5,12 +5,7 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
 fi
 
 if [ ! -z $I2PROUTER ]; then
-  echo "$I2PROUTER" "$I2PCOMMAND"
-  http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || "$I2PROUTER" "$I2PCOMMAND"
-else if [ -d "I2P/bin" ]; then
-  http_proxy=http://127.0.0.1:4444 curl http://proxy.i2p || ./I2P/bin/I2P; \
-  echo "running the jpackaged I2P router since we can't find another one to use."
-
+  "$I2PROUTER" start
 fi
 
 if [ -f "$HOME/.i2p/router.config" ]; then
@@ -35,8 +30,6 @@ fi
 if [ ! -d "$CONFIGURING_PROFILE" ]; then
   mkdir -p "$CONFIGURING_PROFILE" 
   cp -vr /var/lib/i2pbrowser/app-profile/* "$CONFIGURING_PROFILE" 
-else
-  cp -vr /var/lib/i2pbrowser/profile/extensions/* "$CONFIGURING_PROFILE/extensions"
 fi
 
 if [ ! -f "$CONFIGURING_PROFILE/user.js" ]; then