diff --git a/README.md b/README.md
index 3745bb785..26007fcb4 100644
--- a/README.md
+++ b/README.md
@@ -14,9 +14,11 @@ This repository is updated daily with the most recently added submissions. Any a
 
 Exploits are located in the `/exploit/` directory, shellcodes can be found in the `/shellcode/` directory.
 
+- - -
+
 ## License
 
-This project is released under "[GNU General Public License v2.0](https://github.com/offensive-security/exploit-database/blob/master/LICENSE.md)".
+This project (and SearchSploit) is released under "[GNU General Public License v2.0](https://github.com/offensive-security/exploit-database/blob/master/LICENSE.md)".
 
 - - -
 
@@ -75,16 +77,15 @@ root@kali:~# searchsploit -h
 
 root@kali:~#
 root@kali:~# searchsploit afd windows local
-
 ---------------------------------------------------------------------------------------- -----------------------------------
  Exploit Title                                                                          |  Path
                                                                                         | (/usr/share/exploitdb/)
 ---------------------------------------------------------------------------------------- -----------------------------------
-Microsoft Windows (x86) - 'afd.sys' Local Privilege Escalation (MS11-046)               | exploits/win_x86/local/40564.c
+Microsoft Windows (x86) - 'afd.sys' Local Privilege Escalation (MS11-046)               | exploits/windows_x86/local/40564.c
 Microsoft Windows - 'AfdJoinLeaf' Local Privilege Escalation (MS11-080) (Metasploit)    | exploits/windows/local/21844.rb
 Microsoft Windows - 'afd.sys' Local Kernel (PoC) (MS11-046)                             | exploits/windows/dos/18755.c
-Microsoft Windows 7 (x64) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/win_x86-64/local/39525.py
-Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/win_x86/local/39446.py
+Microsoft Windows 7 (x64) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/windows_x86-64/local/39525.py
+Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)  | exploits/windows_x86/local/39446.py
 Microsoft Windows XP - 'afd.sys' Local Kernel Denial of Service                         | exploits/windows/dos/17133.c
 Microsoft Windows XP/2003 - 'afd.sys' Local Privilege Escalation (K-plugin) (MS08-066)  | exploits/windows/local/6757.txt
 Microsoft Windows XP/2003 - 'afd.sys' Local Privilege Escalation (MS11-080)             | exploits/windows/local/18176.py
@@ -94,13 +95,15 @@ root@kali:~#
 root@kali:~# searchsploit -p 39446
   Exploit: Microsoft Windows 7 (x86) - 'afd.sys' Dangling Pointer Privilege Escalation (MS14-040)
       URL: https://www.exploit-db.com/exploits/39446/
-     Path: /usr/share/exploitdb/exploits/win_x86/local/39446.py
+     Path: /usr/share/exploitdb/exploits/windows_x86/local/39446.py
 File Type: Python script, ASCII text executable, with CRLF line terminators
 
 Copied EDB-ID #39446's path to the clipboard.
 root@kali:~#
 ```
 
+- - -
+
 ## Install
 
 SearchSploit requires either "CoreUtils" or "utilities" (e.g. `bash`, `sed`, `grep`, `awk`, etc.) for the core features to work.
@@ -132,6 +135,8 @@ $ sudo ln -sf /opt/exploit-database/searchsploit /usr/local/bin/searchsploit
 $ sed 's|path_array+=(.*)|path_array+=("/opt/exploit-database")|g' /opt/exploit-database/.searchsploit_rc > ~/.searchsploit_rc
 ```
 
+- - -
+
 ## Credit
 
 The following people made this possible:
diff --git a/searchsploit b/searchsploit
index 6fab28e50..4cf94d765 100755
--- a/searchsploit
+++ b/searchsploit
@@ -1,6 +1,6 @@
 #!/bin/bash
 #       Name: SearchSploit - Exploit-DB's CLI search tool
-#    Version: 4.0.0 (Release date: 2018-01-23)
+#    Version: 4.0.1 (Release date: 2018-01-24)
 # Written by: Offensive Security, Unix-Ninja, and g0tmi1k
 #   Homepage: https://github.com/offensive-security/exploit-database
 #     Manual: https://www.exploit-db.com/searchsploit/
@@ -470,7 +470,7 @@ function findresults()
 
 
   ## Dynamically set column widths to the current screen size
-  [[ "${WEBLINK}" -eq 1 ]] && COL2=45 || COL2=$(( ${#path_in} + 20 ))
+  [[ "${WEBLINK}" -eq 1 ]] && COL2=45 || COL2=$(( ${#path_in} + 21 ))
   COL1=$(( $( tput cols ) - COL2 - 1 ))
 
 
@@ -700,11 +700,13 @@ for (( i=0; i<${arraylength}; i++ )); do
     echo "[i] Found (#1): $(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)/${files_array[${i}]}"
     echo "[i] To remove this message, please edit \"${rc_file}\" for \"${files_array[${i}]}\" (package_array: ${package_array[${i}]})"
     path_array[${i}]="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd)"
+    echo
   ## Method #2 - Symbolic link
   elif [[ -f "$(dirname "$(readlink "$0")")/${files_array[${i}]}" ]]; then
     echo "[i] Found (#2): $(dirname "$(readlink "$0")")/${files_array[${i}]}"
     echo "[i] To remove this message, please edit \"${rc_file}\" for \"${files_array[${i}]}\" (package_array: ${package_array[${i}]})"
     path_array[${i}]="$(dirname "$(readlink "$0")")"
+    echo
   else
     #echo "[!] Could not find: ${files}"
     #echo "[i] To remove this message, please remove \"${files_array[${i}]}\" (package_array: ${package_array[${i}]}) from \"${rc_file}\""
@@ -713,8 +715,8 @@ for (( i=0; i<${arraylength}; i++ )); do
     unset "name_array[${i}]"
     unset "git_array[${i}]"
     unset "package_array[${i}]"
+    #echo
   fi
-  echo
 done