3 files changed, 7 insertions, 13 deletions
diff --git a/examples/tutorial/semantics/Base.gf b/examples/tutorial/semantics/Base.gf
index 4586c3106..85868d7ac 100644
--- a/examples/tutorial/semantics/Base.gf
+++ b/examples/tutorial/semantics/Base.gf
@@ -30,7 +30,7 @@ fun
 
 -- lexicon
 
-  UseInt  : Int -> PN ;
+  UseInt : Int -> PN ;
 
   Number : CN ;
   Even, Odd, Prime : AP ;
diff --git a/examples/tutorial/semantics/BaseI.gf b/examples/tutorial/semantics/BaseI.gf
index ec967e443..b7ed86666 100644
--- a/examples/tutorial/semantics/BaseI.gf
+++ b/examples/tutorial/semantics/BaseI.gf
@@ -32,7 +32,7 @@ lin
   And = and_Conj ;
   Or  = or_Conj ;
 
-  UseInt i = symb i ;
+  UseInt i = symb (i ** {lock_Int = <>}) ; ---- terrible to need this
 
   Number = mkCN number_N ;
 
@@ -46,15 +46,15 @@ lin
  
   Sum     = prefix sum_N2 ;
   Product = prefix product_N2 ;
-  GCD nps = mkNP (mkDet (mkQuantSg defQuant) (mkOrd great_A)) 
+  GCD nps = mkNP (mkDet DefArt (mkOrd great_A)) 
               (mkCN common_A (mkCN divisor_N2 (mkNP and_Conj nps))) ;
 
   WhatIs np = mkPhr (mkQS (mkQCl whatSg_IP (mkVP np))) ;
-  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP whichPl_IDet cn) (mkVP ap))) ;
+  WhichAre cn ap = mkPhr (mkQS (mkQCl (mkIP which_IQuant cn) (mkVP ap))) ;
   QuestS s = mkPhr (mkQS (mkQCl s)) ;
 
-  Yes = yes_Phr ;
-  No = no_Phr ;
+  Yes = mkPhr yes_Utt ;
+  No = mkPhr no_Utt ;
 
   Value np = mkPhr (mkUtt np) ;
   Many list = mkNP and_Conj list ;
@@ -65,6 +65,6 @@ lin
 
 oper
   prefix : G.N2 -> G.ListNP -> G.NP = \n2,nps -> 
-    mkNP defSgDet (mkCN n2 (mkNP and_Conj nps)) ;
+    mkNP DefArt (mkCN n2 (mkNP and_Conj nps)) ;
   
 }
diff --git a/examples/tutorial/semantics/Core.gf b/examples/tutorial/semantics/Core.gf
deleted file mode 100644
index 975cf827f..000000000
--- a/examples/tutorial/semantics/Core.gf
+++ /dev/null
@@ -1,6 +0,0 @@
-abstract Core = {
-
-  cat
-    
-
-}