diff --git a/gssapi.conf b/gssapi.conf
index ba4e144..183e134 100644
--- a/gssapi.conf
+++ b/gssapi.conf
@@ -1,4 +1,4 @@
 com.ca.commons.jndi.JNDIOps {
   com.sun.security.auth.module.Krb5LoginModule required client=TRUE
-  														useTicketCache=TRUE;
-};
\ No newline at end of file
+  useTicketCache=TRUE;
+};
diff --git a/jxplorer.sh b/jxplorer.sh
index e15e5b6..e88cef6 100755
--- a/jxplorer.sh
+++ b/jxplorer.sh
@@ -15,20 +15,14 @@ else
     JAVA_LOC=java
 fi
 
-
-
 # Find directory of JRE
-${JAVA_LOC} -version  >/dev/null 2>&1
-if [ "$?" != "0" ] ; then
-    basename=`basename $0`
-    dirname=`dirname $0`
-    cd ${dirname}
-    dirname=`pwd`
+$JAVA_LOC -version  >/dev/null 2>&1
+if [ $? -ne 0 ] ; then
+    dirname=$(dirname $0)
+    cd $dirname
+    dirname=$(pwd)
     echo "Using new directory finding code"
-    OPTJX=${dirname}
-	#OPTJX=/opt/jxplorer
-
-	# $OPTJX MUST be the JXplorer install directory, or a link to it, and contain the JRE
+    OPTJX="$dirname"
 
 	if [ ! -d $OPTJX -o ! -h $OPTJX ] ; then
 		echo "Either java must be in the path, or"
@@ -37,34 +31,37 @@ if [ "$?" != "0" ] ; then
 	fi
 
 	cd $OPTJX
-        JAVAV=/opt/jxplorer/jre/bin/java
+        JAVAV="/opt/jxplorer/jre/bin/java"
 else
-        JAVAV=${JAVA_LOC}
+        JAVAV="$JAVA_LOC"
 fi
 
-JXOPTS=$JXOPTS" -Dfile.encoding=utf-8"
+JXOPTS+="-Dfile.encoding=utf-8"
 
 case $(uname) in
    Darwin*)  
-   JXOPTS=$JXOPTS "-Xdock:name=\"JXplorer\" -Dapple.laf.useScreenMenuBar=true"
+   JXOPTS+="$JXOPTS -Xdock:name=\"JXplorer\" -Dapple.laf.useScreenMenuBar=true"
    echo "runing OSX version";;
 esac
 
 echo "starting JXplorer..."
 
+DIRNAME=$(dirname $0)
 FAIL=0
 if [ "$1" = "console" ] ; then
-    echo  "$JAVAV $JXOPTS  -cp ".:jars/*:jasper/lib/*" com.ca.directory.jxplorer.JXplorer $2 $3 $4 $5 $6 $7 $8 $9"
-    $JAVAV $JXOPTS  -cp ".:jars/*:jasper/lib/*" com.ca.directory.jxplorer.JXplorer $2 $3 $4 $5 $6 $7 $8 $9
+    cd $DIRNAME
+    echo "$JAVAV $JXOPTS -cp .:jars/*:jasper/lib/* com.ca.directory.jxplorer.JXplorer $2 $3 $4 $5 $6 $7 $8 $9"
+    $JAVAV $JXOPTS -cp .:jars/*:jasper/lib/* com.ca.directory.jxplorer.JXplorer $2 $3 $4 $5 $6 $7 $8 $9
 
-    if [ "$?" != "0" ]; then
+    if [ $? -ne 0 ]; then
         FAIL=1
     fi
 else
+    cd $DIRNAME
     echo "Use \"jxplorer.sh console\" if you want logging to the console"
-    $JAVAV $JXOPTS -Xms2048m -cp ".:jars/*:jasper/lib/*" com.ca.directory.jxplorer.JXplorer $1 $2 $3 $4 $5 $6 $7 $8 $9>/dev/null 2>&1
+    $JAVAV $JXOPTS -Xms2048m -cp .:jars/*:jasper/lib/* com.ca.directory.jxplorer.JXplorer $1 $2 $3 $4 $5 $6 $7 $8 $9>/dev/null 2>&1
 
-    if [ "$?" != "0" ]; then
+    if [ $? -ne 0 ]; then
         FAIL=1
     fi
 fi
diff --git a/src/com/ca/commons/cbutil/CBUtility.java b/src/com/ca/commons/cbutil/CBUtility.java
index 3b908fc..9d69623 100644
--- a/src/com/ca/commons/cbutil/CBUtility.java
+++ b/src/com/ca/commons/cbutil/CBUtility.java
@@ -1414,7 +1414,8 @@ else if (isMac())  // TODO: this doesn't seem to work??
         }
 
         // try default 'user home' location...
-        defaultConfigDirectory = System.getProperty("user.home") + File.separator + applicationName;
+        // under linux, this should be /home/user/.config/jxplorer
+        defaultConfigDirectory = System.getProperty("user.home") + File.separator + ".config" + File.separator + applicationName;
         if (checkAndCreateWorkingDirectory(defaultConfigDirectory))
             return defaultConfigDirectory;
 
@@ -1434,7 +1435,7 @@ else if (isMac())  // TODO: this doesn't seem to work??
      */
     public static String getPropertyConfigPath(String applicationName, String configFileName)
     {
-        String configDir = getConfigDirectory(applicationName) + configFileName;
+        String configDir = getConfigDirectory(applicationName) + File.separator + configFileName;
 
         log.fine("USING CONFIG DIR: " + configDir);
 
@@ -1496,4 +1497,4 @@ public static void copyFile(File sourceFile, File destFile) throws IOException {
         }
     }
 
-}
\ No newline at end of file
+}
diff --git a/src/com/ca/directory/jxplorer/JXplorer.java b/src/com/ca/directory/jxplorer/JXplorer.java
index 185ddbd..9fbe92d 100644
--- a/src/com/ca/directory/jxplorer/JXplorer.java
+++ b/src/com/ca/directory/jxplorer/JXplorer.java
@@ -643,7 +643,7 @@ private void checkAndCopy(String sourceFileName)
         if (sourceFileName.endsWith(".default"))
             destinationFileName = sourceFileName.substring(0, sourceFileName.length() - 8);
 
-        File destinationFile = new File(JXConfig.getConfigDirectory() + destinationFileName);
+        File destinationFile = new File(JXConfig.getConfigDirectory() + File.separator + destinationFileName);
 
         if (!destinationFile.isDirectory() && destinationFile.exists())
             return;  // it's already there - nothing to do.