diff --git a/monad b/monad
index 3cb103ecff9a4293d0ceef5b90c30cb29540abe7..95e2c77ba91591f477857520b42fef7b92200ae3 100755
--- a/monad
+++ b/monad
@@ -10,12 +10,13 @@ while [ -h "$SOURCE" ] ; do
 		SOURCE="$(dirname "$LAST_SOURCE")/$SOURCE";
 	fi;
 done
-MONAD_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )/source"
+MONAD_DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
+SOURCE_DIR=$MONAD_DIR/source
 CALLING_DIR=`pwd`
 
 svn up $MONAD_DIR -q
-make -C $MONAD_DIR -q
+make -C $SOURCE_DIR -q
 if [ "$?" -ne 0 ]; then
-	make -C $MONAD_DIR --quiet
+	make -C $SOURCE_DIR --quiet
 fi
-$MONAD_DIR/pure-monad $@
+$SOURCE_DIR/pure-monad $@
diff --git a/source/monad_shared.cpp b/source/monad_shared.cpp
index fb6f846b1373cac21cf1f6f187e7074a350fd500..f8449b9a167dc84d3aa52142b397ccf238ab9121 100644
--- a/source/monad_shared.cpp
+++ b/source/monad_shared.cpp
@@ -14,8 +14,8 @@ namespace monad_shared
 namespace versioninfo
 {
 const char * official_name = "Monad Autograder";
-const char * version_name  = "confession";
-const Version version_num  = Version(2, 1, 4, 3);
+const char * version_name  = "mazecity";
+const Version version_num  = Version(3, 0, 0, 0);
 const char * date          = "18 Jan 2012";
 }