diff --git a/plugins/available/dirs.plugin.bash b/plugins/available/dirs.plugin.bash
index 4b82291c..4781530c 100644
--- a/plugins/available/dirs.plugin.bash
+++ b/plugins/available/dirs.plugin.bash
@@ -80,7 +80,7 @@ S () {				# SAVE a BOOKMARK
     about 'save a bookmark'
     group 'dirs'
 
-    sed "/$@/d" ~/.dirs > ~/.dirs1;
+    sed "/^$@=/d" ~/.dirs > ~/.dirs1;
     \mv ~/.dirs1 ~/.dirs;
     echo "$@"=\"`pwd`\" >> ~/.dirs;
     source ~/.dirs ;
@@ -90,7 +90,7 @@ R () {				# remove a BOOKMARK
     about 'remove a bookmark'
     group 'dirs'
 
-    sed "/$@/d" ~/.dirs > ~/.dirs1;
+    sed "/^$@=/d" ~/.dirs > ~/.dirs1;
     \mv ~/.dirs1 ~/.dirs;
 }
 
diff --git a/plugins/available/jekyll.plugin.bash b/plugins/available/jekyll.plugin.bash
index 6254a87f..eea8ca94 100644
--- a/plugins/available/jekyll.plugin.bash
+++ b/plugins/available/jekyll.plugin.bash
@@ -67,12 +67,6 @@ newpost() {
     return 1
   fi
 
-  if [ -z "$SITE" ]
-  then
-    echo "No such site."
-    return 1
-  fi
-
   loc=0
 
   for site in ${SITES[@]}
@@ -86,6 +80,12 @@ newpost() {
     loc=$(($loc+1))
   done
 
+  if [ -z "$SITE" ]
+  then
+    echo "No such site."
+    return 1
+  fi
+
   # 'builtin cd' into the local jekyll root
 
   builtin cd "$SITE/_posts"
@@ -294,7 +294,7 @@ function testsite() {
   fi
 
   builtin cd $SITE
-  jekyll --server --auto
+  jekyll serve
 }
 
 function buildsite() {
@@ -327,7 +327,7 @@ function buildsite() {
 
   builtin cd $SITE
   rm -rf _site
-  jekyll --no-server
+  jekyll build
 }
 
 function deploysite() {