diff --git a/src/lib_utils/trace.ml b/src/lib_utils/trace.ml
index 6dc7a7093..29686875b 100644
--- a/src/lib_utils/trace.ml
+++ b/src/lib_utils/trace.ml
@@ -186,8 +186,8 @@ let bind_fold_map_list = fun f acc lst ->
         f acc hd >>? fun (acc' , hd') ->
         aux (acc' , hd' :: prev) f tl
   in
-  aux (acc , []) f (List.rev lst) >>? fun (_acc' , lst') ->
-  ok lst'
+  aux (acc , []) f lst >>? fun (_acc' , lst') ->
+  ok @@ List.rev lst'
 
 let bind_fold_right_list f init lst =
   let aux x y =
diff --git a/src/ligo/compiler/compiler_environment.ml b/src/ligo/compiler/compiler_environment.ml
index 66dc8c9ff..0328d5859 100644
--- a/src/ligo/compiler/compiler_environment.ml
+++ b/src/ligo/compiler/compiler_environment.ml
@@ -8,13 +8,18 @@ module Stack = Meta_michelson.Stack
 
 let get : environment -> string -> michelson result = fun e s ->
   let%bind (type_value , position) =
-    generic_try (simple_error "Environment.get") @@
+    let error =
+      let title () = "Environment.get" in
+      let content () = Format.asprintf "%s in %a"
+          s PP.environment e in
+      error title content in
+    generic_try error @@
     (fun () -> Environment.get_i s e) in
   let rec aux = fun n ->
     match n with
     | 0 -> i_dup
-    | n -> dip @@ seq [
-        aux (n - 1) ;
+    | n -> seq [
+        dip @@ aux (n - 1) ;
         i_swap ;
       ]
   in
@@ -49,7 +54,7 @@ let set : environment -> string -> michelson result = fun e s ->
   let code = aux position in
 
   let%bind () =
-    let error () = ok @@ simple_error "error producing Env.get" in
+    let error () = ok @@ simple_error "error producing Env.set" in
     let%bind (Stack.Ex_stack_ty env_stack_ty) = Compiler_type.Ty.environment e in
     let%bind (Ex_ty ty) = Compiler_type.Ty.type_ type_value in
     let input_stack_ty = Stack.(ty @: env_stack_ty) in
@@ -85,16 +90,16 @@ let select : environment -> string list -> michelson result = fun e lst ->
   let code =
     let aux = fun acc (s , _) ->
       seq [
+        dip acc ;
         if List.mem s lst
         then seq []
         else i_drop ;
-        dip acc ;
       ]
     in
     Environment.fold aux (seq []) e in
 
   let%bind () =
-    let error () = ok @@ simple_error "error producing Env.get" in
+    let error () = ok @@ simple_error "error producing Env.select" in
     let%bind (Stack.Ex_stack_ty input_stack_ty) = Compiler_type.Ty.environment e in
     let e' = Environment.filter (fun (s , _) -> List.mem s lst) e in
     let%bind (Stack.Ex_stack_ty output_stack_ty) = Compiler_type.Ty.environment e' in
@@ -107,6 +112,8 @@ let select : environment -> string list -> michelson result = fun e lst ->
 
   ok code
 
+let clear : environment -> michelson result = fun e -> select e []
+
 let select_env : environment -> environment -> michelson result = fun e e' ->
   let lst = Environment.get_names e' in
   select e lst
diff --git a/src/ligo/compiler/compiler_program.ml b/src/ligo/compiler/compiler_program.ml
index f6089c99e..045428ddc 100644
--- a/src/ligo/compiler/compiler_program.ml
+++ b/src/ligo/compiler/compiler_program.ml
@@ -38,11 +38,6 @@ let get_predicate : string -> type_value -> expression list -> predicate result
       | x -> simple_fail ("predicate \"" ^ x ^ "\" doesn't exist")
     )
 
-let virtual_push = fun first m ->
-  match first with
-  | true -> m
-  | false -> seq [m ; i_pair]
-
 let rec translate_value (v:value) : michelson result = match v with
   | D_bool b -> ok @@ prim (if b then D_True else D_False)
   | D_int n -> ok @@ int (Z.of_int n)
@@ -78,8 +73,6 @@ and translate_function (content:anon_function) : michelson result =
 and translate_expression ?(first=false) (expr:expression) (env:environment) : (michelson * environment) result =
   let (expr' , ty , _) = Combinators.Expression.(get_content expr , get_type expr , get_environment expr) in
   let error_message () = Format.asprintf  "%a" PP.expression expr in
-  let virtual_push_first = virtual_push first in
-  let virtual_push = virtual_push false in
 
   let return code =
     let%bind (Stack.Ex_stack_ty input_stack_ty) = Compiler_type.Ty.environment env in
@@ -118,20 +111,19 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
   | E_literal v ->
       let%bind v = translate_value v in
       let%bind t = Compiler_type.type_ ty in
-      return @@ virtual_push_first @@ i_push t v
+      return @@ i_push t v
   | E_application(f, arg) -> (
       match Combinators.Expression.get_type f with
       | T_function _ -> (
           trace (simple_error "Compiling quote application") @@
           let%bind (f , env') = translate_expression ~first f env in
           let%bind (arg , _) = translate_expression arg env' in
-          return @@ virtual_push @@ seq [
+          return @@ seq [
             i_comment "quote application" ;
             i_comment "get f" ;
             f ;
             i_comment "get arg" ;
             arg ;
-            i_unpair ; dip i_unpair ;
             prim I_EXEC ;
           ]
         )
@@ -150,15 +142,14 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
             error error_title error_content
           in
           trace error @@
-          return @@ virtual_push @@ seq [
+          return @@ seq [
             i_comment "(* unit :: env *)" ;
             i_comment "compute arg" ;
-            arg' ; i_unpair ;
+            arg' ;
             i_comment "(* (arg * unit) :: env *)" ;
             i_comment "compute closure" ;
-            dip @@ seq [f' ; i_unpair ; i_unpair] ;
+            dip @@ seq [f' ; i_unpair] ;
             i_comment "(* arg :: capture :: f :: unit :: env *)" ;
-            i_pair ;
             i_exec ; (* output :: stack :: env *)
           ]
         )
@@ -166,14 +157,16 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
     )
   | E_variable x ->
       let%bind code = Compiler_environment.get env x in
-      return @@ seq [
-        dip (seq [i_dup ; code]) ;
-        i_swap ;
-      ]
+      return code
   | E_constant(str, lst) ->
+      let module L = Logger.Stateful() in
       let%bind lst' =
         let aux env expr =
-          let%bind (code , env') = translate_expression ~first expr env in
+          let%bind (code , env') = translate_expression expr env in
+          L.log @@ Format.asprintf "\n%a -> %a in %a\n"
+            PP.expression expr
+            Michelson.pp code
+            PP.environment env ;
           ok (env' , code)
         in
         bind_fold_map_list aux env lst in
@@ -183,26 +176,22 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
             c ;
           ]
         | Unary f, 1 -> ok @@ seq @@ lst' @ [
-            i_unpair ;
             f ;
           ]
         | Binary f, 2 -> ok @@ seq @@ lst' @ [
-            i_unpair ;
-            dip i_unpair ;
-            i_swap ;
             f ;
           ]
         | Ternary f, 3 -> ok @@ seq @@ lst' @ [
-            i_unpair ;
-            dip i_unpair ;
-            dip (dip i_unpair) ;
-            i_swap ;
-            dip i_swap ;
-            i_swap ;
             f ;
           ]
         | _ -> simple_fail "bad arity"
       in
+      let error =
+        let title () = "error compiling constant" in
+        let content () = L.get ()
+        in
+        error title content in
+      trace error @@
       return code
   | E_empty_map sd ->
       let%bind (src, dst) = bind_map_pair Compiler_type.type_ sd in
@@ -238,11 +227,11 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
       return code
     )
   | E_if_left (c, (_ , l), (_ , r)) -> (
-      let%bind (c' , env') = translate_expression c env in
-      let%bind (l' , _) = translate_expression l env' in
-      let%bind (r' , _) = translate_expression r env' in
-      let%bind restrict_l = Compiler_environment.select_env env l.environment in
-      let%bind restrict_r = Compiler_environment.select_env env r.environment in
+      let%bind (c' , _env') = translate_expression c env in
+      let%bind (l' , _) = translate_expression l l.environment in
+      let%bind (r' , _) = translate_expression r l.environment in
+      let%bind restrict_l = Compiler_environment.select_env l.environment env in
+      let%bind restrict_r = Compiler_environment.select_env r.environment env in
       let%bind code = ok (seq [
           c' ; i_unpair ;
           i_if_left (seq [
@@ -260,14 +249,13 @@ and translate_expression ?(first=false) (expr:expression) (env:environment) : (m
         ]) in
       return code
     )
-  | E_let_in (_, expr , body) -> (
+  | E_let_in (v, expr , body) -> (
       let%bind (expr' , _) = translate_expression expr env in
-      let%bind (body' , _) = translate_expression body env in
-      let%bind restrict = Compiler_environment.select_env env body.environment in
+      let env' = Environment.add v env in
+      let%bind (body' , _) = translate_expression body env' in
+      let%bind restrict = Compiler_environment.select_env env' env in
       let%bind code = ok (seq [
           expr' ;
-          i_unpair ;
-          i_swap ; dip i_pair ;
           body' ;
           i_comment "restrict let" ;
           dip restrict ;
@@ -318,7 +306,7 @@ and translate_statement ((s', w_env) as s:statement) : michelson result =
         i_comment "declaration" ;
         seq [
           i_comment "expr" ;
-          i_push_unit ; expr ; i_car ;
+          expr ;
         ] ;
         seq [
           i_comment "env <- env . expr" ;
@@ -332,7 +320,7 @@ and translate_statement ((s', w_env) as s:statement) : michelson result =
         i_comment "assignment" ;
         seq [
           i_comment "expr" ;
-          i_push_unit ; expr ; i_car ;
+          expr ;
         ] ;
         seq [
           i_comment "env <- env . expr" ;
@@ -354,16 +342,13 @@ and translate_statement ((s', w_env) as s:statement) : michelson result =
       | E_constant ("FAILWITH" , [ fw ] ) -> (
           let%bind (fw' , _) = translate_expression fw w_env.pre_environment in
           return @@ seq [
-            i_push_unit ;
             fw' ;
-            i_car ;
             i_failwith ;
           ]
         )
       | _ -> (
           let%bind (expr' , _) = translate_expression expr w_env.pre_environment in
           return @@ seq [
-            i_push_unit ;
             expr' ;
             i_drop ;
           ]
@@ -449,14 +434,15 @@ and translate_regular_block ((b, env):block) : michelson result =
   ok code
 
 and translate_quote_body ({body;result} as f:anon_function) : michelson result =
-  let%bind body = translate_regular_block body in
-  let%bind (expr , _) = translate_expression result Environment.empty in
+  let%bind body' = translate_regular_block body in
+  let%bind (expr , _) = translate_expression result (snd body).post_environment in
+  let%bind restrict = Compiler_environment.clear (snd body).post_environment in
   let code = seq [
       i_comment "function body" ;
-      body ;
+      body' ;
       i_comment "function result" ;
       expr ;
-      dip i_drop ;
+      dip restrict ;
     ] in
 
   let%bind _assert_type =
@@ -466,10 +452,11 @@ and translate_quote_body ({body;result} as f:anon_function) : michelson result =
     let output_stack_ty = Stack.(output_ty @: nil) in
     let error_message () =
       Format.asprintf
-        "\ncode : %a\ninput : %a\noutput : %a\n"
+        "\ncode : %a\ninput : %a\noutput : %a\nenv : %a\n"
         Tezos_utils.Micheline.Michelson.pp code
         PP.type_ f.input
         PP.type_ f.output
+        PP.environment (snd body).post_environment
     in
     let%bind _ =
       Trace.trace_tzresult_lwt (
diff --git a/src/ligo/main/main.ml b/src/ligo/main/main.ml
index 2c808ec6c..c52e06d79 100644
--- a/src/ligo/main/main.ml
+++ b/src/ligo/main/main.ml
@@ -126,7 +126,7 @@ let easy_run_typed
   ok typed_result
 
 let easy_run_typed_simplified
-    ?(debug_mini_c = false) ?amount (entry:string)
+    ?(debug_mini_c = false) ?(debug_michelson = false) ?amount (entry:string)
     (program:AST_Typed.program) (input:Ast_simplified.annotated_expression) : Ast_simplified.annotated_expression result =
   let%bind mini_c_main =
     trace (simple_error "transpile mini_c entry") @@
@@ -152,7 +152,7 @@ let easy_run_typed_simplified
       in
       error title content in
     trace error @@
-    Run_mini_c.run_entry ?amount mini_c_main mini_c_value in
+    Run_mini_c.run_entry ~debug_michelson ?amount mini_c_main mini_c_value in
   let%bind typed_result =
     let%bind main_result_type =
       let%bind typed_main = Ast_typed.get_functional_entry program entry in
diff --git a/src/ligo/main/run_mini_c.ml b/src/ligo/main/run_mini_c.ml
index 2f36793fa..360b38f27 100644
--- a/src/ligo/main/run_mini_c.ml
+++ b/src/ligo/main/run_mini_c.ml
@@ -1,6 +1,6 @@
 open Trace
 open Mini_c
-open Compiler.Program
+open! Compiler.Program
 open Memory_proto_alpha.Script_ir_translator
 
 let run_aux ?amount (program:compiled_program) (input_michelson:Michelson.t) : ex_typed_value result =
@@ -29,7 +29,7 @@ let run_node (program:program) (input:Michelson.t) : Michelson.t result =
     Tezos_utils.Memory_proto_alpha.unparse_michelson_data output_ty output in
   ok output
 
-let run_entry ?amount (entry:anon_function) (input:value) : value result =
+let run_entry ?(debug_michelson = false) ?amount (entry:anon_function) (input:value) : value result =
   let%bind compiled =
     let error =
       let title () = "compile entry" in
@@ -39,6 +39,7 @@ let run_entry ?amount (entry:anon_function) (input:value) : value result =
       error title content in
     trace error @@
     translate_entry entry in
+  if debug_michelson then Format.printf "Program: %a\n" Michelson.pp compiled.body ;
   let%bind input_michelson = translate_value input in
   let%bind ex_ty_value = run_aux ?amount compiled input_michelson in
   let%bind (result : value) = Compiler.Uncompiler.translate_value ex_ty_value in
diff --git a/src/ligo/test/test_helpers.ml b/src/ligo/test/test_helpers.ml
index 6754d1e78..1faec8238 100644
--- a/src/ligo/test/test_helpers.ml
+++ b/src/ligo/test/test_helpers.ml
@@ -28,7 +28,7 @@ let expect ?(options = make_options ()) program entry_point input expected =
       let content () = Format.asprintf "Entry_point: %s" entry_point in
       error title content in
     trace run_error @@
-    Ligo.easy_run_typed_simplified ?amount:options.amount entry_point program input in
+    Ligo.easy_run_typed_simplified ~debug_michelson:true ?amount:options.amount entry_point program input in
   let expect_error =
     let title () = "expect result" in
     let content () = Format.asprintf "Expected %a, got %a"