diff --git a/4coder_API/version.h b/4coder_API/version.h
index 059f17c0..b0ee81e7 100644
--- a/4coder_API/version.h
+++ b/4coder_API/version.h
@@ -1,6 +1,6 @@
 #define MAJOR 4
 #define MINOR 0
-#define PATCH 22
+#define PATCH 23
 
 // string
 #define VN__(a,b,c) #a "." #b "." #c
diff --git a/4coder_project_commands.cpp b/4coder_project_commands.cpp
index d7092d31..442ec7fc 100644
--- a/4coder_project_commands.cpp
+++ b/4coder_project_commands.cpp
@@ -582,27 +582,6 @@ project_is_setup(Application_Links *app, char *dir, int32_t dir_len, int32_t dir
     return(result);
 }
 
-// TODO(allen): For this purpose we shouldn't go this far.
-// Instead just let the CWD of the running script be the code home.
-static char get_code_home[] = 
-"# Store the real CWD\n"
-"REAL_PWD=\"$PWD\"\n\n"
-"# Find the code home folder\n"
-"TARGET_FILE=\"$0\"\n"
-"cd `dirname $TARGET_FILE`\n"
-"TARGET_FILE=`basename $TARGET_FILE`\n"
-"while [ -L \"$TARGET_FILE\" ]\n"
-"do\n"
-"TARGET_FILE=`readlink $TARGET_FILE`\n"
-"cd `dirname $TARGET_FILE`\n"
-"TARGET_FILE=`basename $TARGET_FILE`\n"
-"done\n"
-"PHYS_DIR=`pwd -P`\n"
-"SCRIPT_FILE=$PHYS_DIR/$TARGET_FILE\n"
-"CODE_HOME=$(dirname \"$SCRIPT_FILE\")\n\n"
-"# Restore the PWD\n"
-"cd \"$REAL_PWD\"\n\n";
-
 // TODO(allen): Stop using stdio.h, switch to a 4coder buffer API for all file manipulation.
 #include <stdio.h>
 CUSTOM_COMMAND_SIG(setup_new_project){
@@ -695,12 +674,12 @@ CUSTOM_COMMAND_SIG(setup_new_project){
             if (sh_script != 0){
                 fprintf(sh_script, "#!/bin/bash\n\n");
                 
-                fprintf(sh_script, "%s", get_code_home);
+                fprintf(sh_script, "CODE_HOME=\"$PWD\"\n");
                 
                 fprintf(sh_script, "OPTS=%.*s\n", 
                         default_flags_sh.size, default_flags_sh.str);
                 
-                fprintf(sh_script, "pushd %.*s\n", 
+                fprintf(sh_script, "pushd %.*s > /dev/null\n", 
                         output_dir.size, output_dir.str);
                 fprintf(sh_script, "%.*s $OPTS $CODE_HOME/%.*s -o %.*s\n",
                         default_compiler_sh.size, default_compiler_sh.str,
@@ -740,13 +719,13 @@ CUSTOM_COMMAND_SIG(setup_new_project){
                 replace_str(&output_dir, "\\\\", "/");
                 replace_str(&binary_file, "\\\\", "/");
                 
-                fprintf(project_script, "fkey_command_linux[1] = {\"build.sh\", \"*compilation*\", true , true };\n");
+                fprintf(project_script, "fkey_command_linux[1] = {\"./build.sh\", \"*compilation*\", true , true };\n");
                 fprintf(project_script, 
                         "fkey_command_linux[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n", 
                         output_dir.size, output_dir.str,
                         binary_file.size, binary_file.str);
                 
-                fprintf(project_script, "fkey_command_mac[1] = {\"build.sh\", \"*compilation*\", true , true };\n");
+                fprintf(project_script, "fkey_command_mac[1] = {\"./build.sh\", \"*compilation*\", true , true };\n");
                 fprintf(project_script, 
                         "fkey_command_mac[2] = {\"%.*s/%.*s\", \"*run*\", false , true };\n", 
                         output_dir.size, output_dir.str,