diff --git a/stdlib/shell.go b/stdlib/shell.go
index 4f8ccf2..ba12cf5 100644
--- a/stdlib/shell.go
+++ b/stdlib/shell.go
@@ -44,6 +44,11 @@ var JobMap = map[int]Proc{}
  */
 var pgid, pid int
 
+/* cancel func for current running process
+ */
+var CurCancel *context.CancelFunc
+
+
 /* Holds an os/exec Cmd object and its context cancel function
  */
 type Proc struct {
@@ -62,12 +67,13 @@ var LastExitCode int
 // Job control handlers
 func signalHandler() {
     for {
-        sig := <- sigChan
-        switch sig {
-            case syscall.SIGINT:
-                log.Log(log.DEBUG,
-                    "caught SIGINT",
-                    "jobctl")
+        <- sigChan
+        log.Log(log.DEBUG,
+            "caught SIGINT",
+            "jobctl")
+
+        if CurCancel != nil {
+            (*CurCancel)()
         }
     }
 }
@@ -78,7 +84,7 @@ func waitHandler() {
         exit := 0
         if w != nil {
             log.Log(log.ERR,
-                "Child returned error: " + w.Error(),
+                "Child returned: " + w.Error(),
                 "jobctl")
 
             // something outrageous
@@ -90,10 +96,6 @@ func waitHandler() {
 
             LastExitCode = exit
         }
-
-        log.Log(log.DEBUG,
-            "handled sigchld!",
-            "jobctl")
     }
 }
 
@@ -105,7 +107,7 @@ func tcsetpgrp(fd int, pgrp int) error {
 // wrapper for convenience
 func setSigState() {
     signal.Ignore(syscall.SIGTTOU, syscall.SIGTTIN, syscall.SIGTSTP)
-    signal.Notify(sigChan, syscall.SIGINT)
+    signal.Notify(sigChan, syscall.SIGINT, syscall.SIGQUIT)
 }
 
 /* Sets pgid
@@ -189,20 +191,24 @@ func LaunchProcess(
     cmd.Stderr = stderr
 
     cmd.Start()
-    pid := cmd.Process.Pid
+    cpid := cmd.Process.Pid
 
     // TODO: check for clobber?
     // unlikely, but PIDs do reset after a while
-    JobMap[pid] = Proc{ Ctl: cmd, Cancel: cancel }
+    JobMap[cpid] = Proc{ Ctl: cmd, Cancel: cancel }
+    CurCancel = &cancel
 
     if background {
         go func(){
             waitChan <- cmd.Wait()
-            tcsetpgrp(0, pgid)
+            delete(JobMap, cpid)
+            CurCancel = nil
         }()
     } else {
         cmd.Wait()
         tcsetpgrp(0, pgid)
+        delete(JobMap, cpid)
+        CurCancel = nil
     }
 }