diff --git a/scripthaus.md b/scripthaus.md
index 7cf5503f7..3cba8e85d 100644
--- a/scripthaus.md
+++ b/scripthaus.md
@@ -77,14 +77,14 @@ open out/Wave-darwin-x64/Wave.app
 ```bash
 # @scripthaus command build-wavesrv
 cd wavesrv
-CGO_ENABLED=1 go build -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o bin/wavesrv ./cmd
+CGO_ENABLED=1 go build -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o ../bin/wavesrv ./cmd
 ```
 
 ```bash
 # @scripthaus command build-waveshell
 cd waveshell
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
+go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell-v0.3-darwin.amd64 main-waveshell.go
 ```
 
 ```bash
@@ -93,10 +93,10 @@ set -e
 cd waveshell
 GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
 go build -ldflags="$GO_LDFLAGS" -o ~/.mshell/mshell-v0.2 main-waveshell.go
-GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.amd64 main-waveshell.go
-GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.arm64 main-waveshell.go
-GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
-GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.arm64 main-waveshell.go
+GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.amd64 main-waveshell.go
+GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-linux.arm64 main-waveshell.go
+GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.amd64 main-waveshell.go
+GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o ../bin/mshell/mshell-v0.3-darwin.arm64 main-waveshell.go
 ```
 
 ```bash
diff --git a/src/electron/emain.ts b/src/electron/emain.ts
index 8fc08792b..a5e772f0c 100644
--- a/src/electron/emain.ts
+++ b/src/electron/emain.ts
@@ -133,9 +133,6 @@ function getBaseHostPort() {
 }
 
 function getWaveSrvPath() {
-    if (isDev) {
-        return path.join(getAppBasePath(), "wavesrv", "bin", "wavesrv");
-    }
     return path.join(getAppBasePath(), "bin", "wavesrv");
 }
 
diff --git a/waveshell/scripthaus.md b/waveshell/scripthaus.md
deleted file mode 100644
index d6a26698d..000000000
--- a/waveshell/scripthaus.md
+++ /dev/null
@@ -1,18 +0,0 @@
-
-```bash
-# @scripthaus command build
-GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
-```
-
-```bash
-# @scripthaus command fullbuild
-GO_LDFLAGS="-s -w -X main.BuildTime=$(date +'%Y%m%d%H%M')"
-go build -ldflags="$GO_LDFLAGS" -o ~/.mshell/mshell-v0.2 main-waveshell.go
-GOOS=linux GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.amd64 main-waveshell.go
-GOOS=linux GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-linux.arm64 main-waveshell.go
-GOOS=darwin GOARCH=amd64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.amd64 main-waveshell.go
-GOOS=darwin GOARCH=arm64 go build -ldflags="$GO_LDFLAGS" -o bin/mshell-v0.3-darwin.arm64 main-waveshell.go
-```
-
-
diff --git a/wavesrv/pkg/cmdrunner/shparse.go b/wavesrv/pkg/cmdrunner/shparse.go
index b75d5a73b..2a8a6d164 100644
--- a/wavesrv/pkg/cmdrunner/shparse.go
+++ b/wavesrv/pkg/cmdrunner/shparse.go
@@ -179,7 +179,7 @@ func setBracketArgs(argMap map[string]string, bracketStr string) error {
 	return nil
 }
 
-var literalRtnStateCommands = []string{".", "source", "unset", "cd", "alias", "unalias", "deactivate"}
+var literalRtnStateCommands = []string{".", "source", "unset", "cd", "alias", "unalias", "deactivate", "eval"}
 
 func getCallExprLitArg(callExpr *syntax.CallExpr, argNum int) string {
 	if len(callExpr.Args) <= argNum {
diff --git a/wavesrv/pkg/scbase/scbase.go b/wavesrv/pkg/scbase/scbase.go
index 382238ab1..444bae64f 100644
--- a/wavesrv/pkg/scbase/scbase.go
+++ b/wavesrv/pkg/scbase/scbase.go
@@ -75,9 +75,6 @@ func MShellBinaryDir() string {
 	if appPath == "" {
 		appPath = "."
 	}
-	if IsDevMode() {
-		return path.Join(appPath, "waveshell", "bin")
-	}
 	return path.Join(appPath, "bin", "mshell")
 }
 
@@ -159,7 +156,7 @@ func AcquireWaveLock() (*os.File, error) {
 		return nil, fmt.Errorf("cannot find/create WAVETERM_HOME directory %q", homeDir)
 	}
 	lockFileName := path.Join(homeDir, WaveLockFile)
-	fd, err := os.Create(lockFileName)
+	fd, err := os.OpenFile(lockFileName, os.O_WRONLY|os.O_CREATE, 0600)
 	if err != nil {
 		return nil, err
 	}
diff --git a/wavesrv/scripthaus.md b/wavesrv/scripthaus.md
deleted file mode 100644
index a3a18227c..000000000
--- a/wavesrv/scripthaus.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# SH2 Server Commands
-
-```bash
-# @scripthaus command dump-schema-dev
-sqlite3 ~/.waveterm-dev/waveterm.db .schema > db/schema.sql
-```
-
-```bash
-# @scripthaus command opendb-dev
-sqlite3 ~/.waveterm-dev/waveterm.db
-```
-
-```bash
-# @scripthaus command build
-go build -ldflags "-X main.BuildTime=$(date +'%Y%m%d%H%M')" -o bin/wavesrv ./cmd
-```