diff --git a/001_apt-sources.sh b/001_apt-sources.sh
index b227a43..f848e94 100644
--- a/001_apt-sources.sh
+++ b/001_apt-sources.sh
@@ -1,31 +1,47 @@
 # avoid duplicates
+set -x
 rm /etc/apt/sources.list
 rm /etc/apt/sources.list.d/devuan
 
-ACTIVE=/etc/apt/sources.list.d/
-AVAILABLE=/etc/apt/sources.list-available/
+ACTIVE=/etc/apt/sources.list.d
+AVAILABLE=/etc/apt/sources.list-available
 mkdir -p "${AVAILABLE}"
 
-GROUPS=(main contrib non-free)
-ACTIVE_LIST=('devuan_ascii' 'devuan_ascii-security' 'devuan_ascii-updates' 'devuan_ascii-backports')
-INACTIVE_LIST=('devuan_jessie' 'devuan_jessie-security' 'devuan_jessie-updates' 'devuan_jessie-backports' 'devuan_beowulf' 'devuan_beowulf-security' 'devuan_beowulf-updates' 'devuan_beowulf-backports' 'devuan_ceres' 'devuan_experimental')
+SECTION=( 'main' 'contrib' 'non-free' )
+echo ${#SECTION[@]}
+echo ${SECTION[@]}
+echo ${SECTION[1]}
+echo ${SECTION[2]}
+echo ${SECTION[3]}
+ACTIVE_LIST=( 'ascii' 'ascii-security' 'ascii-updates' 'ascii-backports' )
+INACTIVE_LIST=( 'jessie' 'jessie-security' 'jessie-updates' 'jessie-backports' 'beowulf' 'beowulf-security' 'beowulf-updates' 'beowulf-backports' 'ceres' )
+OTHER_LIST=( 'experimental' )
 
 echo ${#ACTIVE_LIST[@]}
 for RELEASE in "${ACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/${RELEASE}.list" <<EOF
-deb http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
-deb-src http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
 EOF
-ln -sf "${AVAILABLE}"/"${RELEASE}".list "${ACTIVE}"/"${RELEASE}".list
+ln -sf "${AVAILABLE}"/devuan_"${RELEASE}".list "${ACTIVE}"/devuan_"${RELEASE}".list
 done
 
 echo ${#INACTIVE_LIST[@]}
 for RELEASE in "${INACTIVE_LIST[@]}"; do
 	echo "${RELEASE}"
-	bash -c "cat > ${AVAILABLE}/${RELEASE}.list" <<EOF
-deb http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
-deb-src http://pkgmaster.devuan.org/merged/ "${RELEASE}" "${GROUPS[@]}"
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+deb http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+deb-src http://pkgmaster.devuan.org/merged/ ${RELEASE} ${SECTION[@]}
+EOF
+done
+
+echo ${#OTHER_LIST[@]}
+for RELEASE in "${OTHER_LIST[@]}"; do
+	echo "${RELEASE}"
+	bash -c "cat > ${AVAILABLE}/devuan_${RELEASE}.list" <<EOF
+deb http://packages.devuan.org/devuan ${RELEASE} main
+deb-src http://packages.devuan.org/devuan ${RELEASE} main
 EOF
 done
 
diff --git a/010_eudev.sh b/010_eudev.sh
index 815581b..64d121a 100644
--- a/010_eudev.sh
+++ b/010_eudev.sh
@@ -1,9 +1,11 @@
 # to remove you need to specify the version of libudev1 to downgrade
 # apt-cache policy libudev1
 # apt-get install udev libudev1=232-25+deb9u1
-ln -s /etc/apt/sources.list-available/devuan-experimental.list /etc/apt/sources.list.d/devuan-experimental.list
+ln -sf /etc/apt/sources.list-available/devuan_experimental.list /etc/apt/sources.list.d/devuan_experimental.list
+ls -lh /etc/apt/sources.list.d
 apt-get update
+apt-get policy eudev
 apt-get -t experimental install eudev
 
-rm /etc/apt/sources.list.d/devuan-experimental.list
+rm /etc/apt/sources.list.d/devuan_experimental.list
 apt-get update
diff --git a/020_console.sh b/020_console.sh
index 1fecd0e..44dedd8 100644
--- a/020_console.sh
+++ b/020_console.sh
@@ -21,7 +21,7 @@ wget -c --directory-prefix /usr/share/fonts/PSF https://github.com/powerline/fon
 sed -i 's,^\(ACTIVE_CONSOLES=\).*,\1'\"/dev/tty\[1-6\]\"',' /etc/default/console-setup
 sed -i 's,^\(CHARMAP=\).*,\1'\"UTF-8\"',' /etc/default/console-setup
 sed -i 's,^\(CODESET=\).*,\1'\"guess\"',' /etc/default/console-setup
-sed -i 's,^\(FONTFACE=\).*,\1'\"Terminess Powerline\"',' /etc/default/console-setup
+sed -i 's,^\(FONTFACE=\).*,\1'\"Terminess\ Powerline\"',' /etc/default/console-setup
 sed -i 's,^\(FONTSIZE=\).*,\1'\"8x16\"',' /etc/default/console-setup
 sed -i 's,^\(VIDEOMODE=\).*,\1'\"\"',' /etc/default/console-setup
 echo "FONT=/usr/share/fonts/PSF/ter-powerline-v16b.psf" >> /etc/default/console-setup
diff --git a/020_neovim.sh b/020_neovim.sh
index 6e1962a..0e2c653 100644
--- a/020_neovim.sh
+++ b/020_neovim.sh
@@ -1,14 +1,13 @@
 # Install Neovim
 apt-get install software-properties-common -y
-apt-get install python-software-properties -y
 apt-get install -y neovim 
 
 # Need to backport from sid
 apt-get install -y #python-neovim python3-neovim
 
 # python-neovim if notavailableasapackage
-pip2 install --user --upgrade neovim
-pip3 install --user --upgrade neovim
+#pip2 install --user --upgrade neovim
+#pip3 install --user --upgrade neovim
 
 
 
diff --git a/020_smartmon.sh b/020_smartmon.sh
index d0b5feb..75a6520 100644
--- a/020_smartmon.sh
+++ b/020_smartmon.sh
@@ -30,7 +30,7 @@ EMAIL=root
 # You must initiate the first selective self test manually (-t select,0-${SIZE}) so smartd will know the slice size to test each day. 
 # To setup a full test of a 1TB disk within 20 days (one 50GB span each day), run this command once: 
 SIZE=99999999
-for i in $(smartctl --scan-open | awk {'print $2'}); 
+for i in $(smartctl --scan-open | awk {'print $1'}); 
 do 
 	echo ${i};
 	smartctl -t select,0-${SIZE} ${i}
diff --git a/020_tmux.sh b/020_tmux.sh
index 40a70ab..7398cc7 100644
--- a/020_tmux.sh
+++ b/020_tmux.sh
@@ -169,6 +169,7 @@ set -g pane-active-border-fg colour069 # 24 blue
 # set -g pane-active-border-bg black
 EOF
 
+mkdir -p ~/.zshrc.d/
 echo "source /usr/share/zsh/vendor_completions/_tmuxinator" > ~/.zshrc.d/006_tmuxinator.zsh
 
 
diff --git a/020_zsh.sh b/020_zsh.sh
index 7580c6b..a08351f 100644
--- a/020_zsh.sh
+++ b/020_zsh.sh
@@ -1,5 +1,5 @@
 apt-get -y install zsh nodejs-legacy
-
+set -x
 # compaudit
 # There are insecure directories: /usr/local/share/zsh/site-functions
 # compaudit | xargs chmod g-w