diff --git a/src/usr/bin/sbopkg b/src/usr/bin/sbopkg
index d7bece6..ab19a8e 100755
--- a/src/usr/bin/sbopkg
+++ b/src/usr/bin/sbopkg
@@ -65,7 +65,6 @@ if [ ! -d "$LOCALREPO" ]; then
     echo "Please create it and run $SCRIPT again." 1>&2
     exit 1
 else
-    #cd $LOCALREPO/$SLACKVER
     cd $LOCALREPO
 fi
 if [ ! -d "$SRCDIR" ]; then
@@ -100,7 +99,7 @@ if [ ! -d "$LOCALREPO/$SLACKVER" ]; then
 $LOCALREPO/$SLACKVER was not found.  Would you like to create it?  \
 Select YES to create or NO to cancel." 10 30 
         if [ $? = 0 ]; then
-            check_write $LOCALREPO/$SLACKVER/
+            check_write $LOCALREPO
             if [ "$WRITE" = "false" ]; then
                 dialog --title "ERROR" --msgbox "You do not have \
 write permissions on the target directory." 8 30
@@ -125,7 +124,7 @@ fi
 }
 
 show_changelog () {
-# Show the changelog
+# Show the SlackBuilds.org changelog
 cd $LOCALREPO/$SLACKVER
 if [ "$DIAG" = 1 ]; then
     if [ ! -e ./ChangeLog.txt ]; then
@@ -142,20 +141,6 @@ else
 fi
 }
 
-get_version_list () {
-# This function displays the Slack versions available in the local SBo
-# repository
-cd $LOCALREPO
-rm -f $TMP/sbopkg_version_list 2> /dev/null
-DIR=( */ )
-if [ -n "$DIR" ]; then
-    for i in ${DIR[*]%/}; do
-        echo "$i \"SBo repo for Slackware version $i\"" >> \
-        $TMP/sbopkg_version_list
-    done
-fi
-exit 0
-}
 
 get_category_list () {
 # This function displays the list of SBo categories in the dialog
@@ -196,7 +181,6 @@ cd $LOCALREPO/$SLACKVER
 }
 
 select_version () {
-#get_version_list
 while [ 0 ]; do
     dialog --title "Choose a Slackware version" \
 --menu "You are currently using sbopkg to browse a local copy of SBo \
@@ -208,7 +192,6 @@ it, please select another version below:" 20 50 3 \
     if [ $? = 1 ]; then
         break
     fi
-#exit 0
     SLACKVER="$(cat $TMP/sbopkg_version_selection)"
     break
 done
@@ -409,7 +392,6 @@ fi
 . $PKGPATH/$PKG.info
 PKGNAME=${PKG##*/}
 SRCNAME=${DOWNLOAD##*/}
-#cd -
 }
 
 gen_search_package () {
@@ -444,7 +426,6 @@ else
         continue 
     fi
 fi
-#cd -
 }
 
 show_readme () {
@@ -480,7 +461,6 @@ build_package () {
 # Start fetching and building the package.
 echo ; echo "Building $PKG"
 cd $LOCALREPO/$SLACKVER/$PKGPATH
-#cd $PKGPATH
 get_source
 echo "Checking MD5SUM for "$SRCNAME"..."
 MD5CHK=$(md5sum $SRCNAME | cut -d' ' -f1)
@@ -646,8 +626,6 @@ to search for" 0 0 2>/$TMP/sbopkg_search_request
     SRCH="$(cat $TMP/sbopkg_search_request)"
     #search_package $SRCH
     gen_search_package $SRCH
-    #SRCHRESULT="$(echo $PKGPATH | sed 's/^.\///')"
-    #dialog --title "Package location" --msgbox "$SRCHRESULT" 8 30
 fi
 
 if [ "$R" = "Cache" ]; then