diff --git a/src/Main.hs b/src/Main.hs
index 57d84fe..b923b0f 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,20 +1,50 @@
+{-# LANGUAGE ExistentialQuantification #-}
 import           Angluin
 import           Bollig
 import           Examples
 import           Teacher
+import           ObservationTable
 import           NLStar
 
 import           Data.IORef (readIORef)
+import           System.Environment
+import           NLambda
+
+data Learner = NomLStar | NomLStarCol | NomNLStar
+  deriving (Show, Read)
+
+data Teacher = EqDFA | EqNFA Int
+  deriving (Show, Read)
+
+data Aut = Fifo Int | Stack Int | Running Int | NFA1 | Bollig Int
+  deriving (Show, Read)
+
+-- existential wrapper
+data A = forall q i . (LearnableAlphabet i, NominalType q, Show q) => A (Automaton q i)
 
 main :: IO ()
 main = do
-    let h = learnAngluin (countingTeacher $ teacherWithTarget (Examples.fifoExample 3))
+    [learnerName, teacherName, autName] <- getArgs
+    A automaton <- return $ case read autName of
+            Fifo n    -> A $ Examples.fifoExample n
+            Stack n   -> A $ Examples.stackExample n
+            Running n -> A $ Examples.runningExample atoms n
+            NFA1      -> A $ Examples.exampleNFA1
+            Bollig n  -> A $ Examples.exampleNFA2 n
+    let teacher = case read teacherName of
+            EqDFA   -> teacherWithTarget automaton
+            EqNFA k -> teacherWithTargetNonDet k automaton
+    let h = case read learnerName of
+            NomLStar    -> learnAngluinRows teacher
+            NomLStarCol -> learnAngluin teacher
+            NomNLStar   -> learnBollig teacher
     putStrLn "Finished! Final hypothesis ="
     print h
-    eqs <- readIORef eqCounter
-    mqs <- readIORef mqCounter
-    putStrLn "Number of equivalence queries:"
-    print eqs
-    putStrLn "Number of membership queries (and sizes+supports):"
-    print (length mqs)
-    print mqs
+    --eqs <- readIORef eqCounter
+    --mqs <- readIORef mqCounter
+    --putStrLn "Number of equivalence queries:"
+    --print eqs
+    --putStrLn "Number of batched membership queries:"
+    --print (length mqs)
+    --putStrLn "Number of membership orbits:"
+    --mapM_ print $ reverse mqs
diff --git a/src/Teacher.hs b/src/Teacher.hs
index 31f465f..a875fe2 100644
--- a/src/Teacher.hs
+++ b/src/Teacher.hs
@@ -100,24 +100,25 @@ countingTeacher delegate = Teacher
     }
     where
         {-# NOINLINE increaseEQ #-}
-        increaseEQ _ = unsafePerformIO $ do
+        increaseEQ a = unsafePerformIO $ do
             i <- readIORef eqCounter
             let j = i + 1
             writeIORef eqCounter j
-            return j
+            return a
         {-# NOINLINE increaseMQ #-}
         increaseMQ q = unsafePerformIO $ do
             new <- newOrbitsInCache q
             l <- readIORef mqCounter
             let l2 = new : l
             writeIORef mqCounter l2
+            return q
         {-# NOINLINE cache #-}
         cache = unsafePerformIO $ newIORef empty
         {-# NOINLINE newOrbitsInCache #-}
         newOrbitsInCache qs = do
             oldCache <- readIORef cache
-            let newQs = qs \\ oldCache
-            writeIORef cache (oldCache `union` qs)
+            let newQs = simplify $ qs \\ oldCache
+            writeIORef cache (simplify $ oldCache `union` qs)
             return $ setOrbitsMaxNumber newQs
 
 -- HACK: Counts number of equivalence queries