diff --git a/scheme/std-command.scm b/scheme/std-command.scm
index 362bf83..fda621b 100644
--- a/scheme/std-command.scm
+++ b/scheme/std-command.scm
@@ -29,7 +29,10 @@
  (make-command-plugin "cd"
 		      no-completer
  		      (lambda (command args)
- 			(chdir (car args)))))
+ 			(chdir (resolve-file-name (if (null? args)
+                                                      "~"
+                                                      (car args))))
+                        (cwd))))
 
 (register-plugin!
  (make-command-plugin "setenv"
@@ -49,4 +52,10 @@
  		      (lambda (command args)
  			(env->alist))))
 
-
+(register-plugin!
+ (make-command-plugin "exit"
+                      no-completer
+                      (lambda (command args)
+                        (exit (if (null? args)
+                                  0
+                                  (string->number (car args)))))))
\ No newline at end of file