Index: sizechecking/Examples.hs
===================================================================
--- sizechecking/Examples.hs	(revision 10)
+++ sizechecking/Examples.hs	(revision 11)
@@ -262,5 +262,5 @@
         if P.not s then
             M.return [name]
-        else
+          else
             M.return []
 
@@ -268,5 +268,6 @@
     if List.null f then 
         P.putStrLn "All ok."
-    else do
+      else do
         P.putStr $ "\n\nFailed test cases: "
         P.putStrLn $ List.intercalate ", " f
+
Index: sizechecking/LICENSE
===================================================================
--- sizechecking/LICENSE	(revision 11)
+++ sizechecking/LICENSE	(revision 11)
@@ -0,0 +1,30 @@
+Copyright (c) 2012, Attila Gobi
+
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    * Redistributions of source code must retain the above copyright
+      notice, this list of conditions and the following disclaimer.
+
+    * Redistributions in binary form must reproduce the above
+      copyright notice, this list of conditions and the following
+      disclaimer in the documentation and/or other materials provided
+      with the distribution.
+
+    * Neither the name of Attila Gobi nor the names of other
+      contributors may be used to endorse or promote products derived
+      from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Index: sizechecking/NC.hs
===================================================================
--- sizechecking/NC.hs	(revision 10)
+++ 	(revision )
@@ -1,28 +1,0 @@
-
-{- Constraints -}
-newtype Term = Term [String]
-    deriving (Show, Eq, Ord)
-nullterm = Term []
-newtype Arithmetics = Arithmetics (Map Term Int)
-    deriving (Show, Eq)
-
-termmul (Term a) (Term b) = Term $ termmul' a b
-    where
-    termmul' []        l         = l
-    termmul' l         []        = l
-    termmul' l1@(x:xs) l2@(y:ys) = if x<y then x:termmul' xs l2
-                                          else y:termmul' l1 ys
-
-instance Num Arithmetics where
-    fromInteger l = Arithmetics $ singleton nullterm $ fromInteger l
-    (Arithmetics a) + (Arithmetics b) = Arithmetics $ unionWith (+) a b
-    (Arithmetics a) * (Arithmetics b) = Arithmetics amul
-        where
-        amul = foldrWithKey tmul empty a
-        tmul :: Term -> Int -> Map Term Int -> Map Term Int
-        tmul t1 v1 val = unionWith (+) val (mapKeys (termmul t1) $ M.map (*v1) b)
-    abs = undefined
-    signum = undefined
-
-data Condition = ZC Arithmetics | LTC Arithmetics Arithmetics | GEC Arithmetics Arithmetics
-    deriving (Show)
Index: sizechecking/README.html
===================================================================
--- sizechecking/README.html	(revision 10)
+++ sizechecking/README.html	(revision 11)
@@ -9,5 +9,5 @@
 <body>
 <h2 id="prerequisites">Prerequisites</h2>
-<p>You need at least version 2011.4.0.0 of haskell platform and the package value-supply. If you have haskell platform installed you can install value-supply by typing</p>
+<p>You need at least version 2011.4.0.0 of the Haskell platform, an installed <a href="http://research.microsoft.com/en-us/um/redmond/projects/z3/">Z3</a> and the package value-supply. If you have a working Haskell platform installed you can install value-supply by typing</p>
 <pre><code>cabal install value-supply</code></pre>
 <h2 id="source-files">Source files</h2>
@@ -27,5 +27,5 @@
 </dl>
 <h2 id="using-the-examples">Using the examples</h2>
-<pre><code>$ ghci Examples.hs 
+<pre><code>$ ghci Examples.hs
 GHCi, version 7.0.4: http://www.haskell.org/ghc/  :? for help
 Loading package ghc-prim ... linking ... done.
@@ -38,6 +38,6 @@
 [4 of 4] Compiling Main             ( Examples.hs, interpreted )
 Ok, modules loaded: Lambda, SizedExp, Constraints, Main.
-*Main&gt; </code></pre>
-<p>Type â<code>runTests</code>â to run all test cases or type â<code>prove map</code>â to prove the function named map.</p>
+*Main&gt;</code></pre>
+<p>Type &quot;<code>runTests</code>&quot; to run all test cases or type &quot;<code>prove map</code>&quot; to prove the function named map.</p>
 <h2 id="under-windows">Under Windows</h2>
 <p>It is not perfect, and you will see a box after every special character, but at least it works.</p>
@@ -65,5 +65,5 @@
 4     where body f l = match l (nil)
 5             ( \x xs -&gt;  cons `app` (f `app` x) `app` (map `app` f `app` xs ))</code></pre>
-<p>Here line 3 tells us map is a top-level binding, where the body of the function is defined in line 4â5 and its size expression is in line 1. Unfortunately the size expression language has not yet been embedded, so it is a bit difficult to read. Type <code>smap</code> in the GHC console to get a pretty printed form.</p>
+<p>Here line 3 tells us map is a top-level binding, where the body of the function is defined in line 4--5 and its size expression is in line 1. Unfortunately the size expression language has not yet been embedded, so it is a bit difficult to read. Type <code>smap</code> in the GHC console to get a pretty printed form.</p>
 <pre><code>*Main&gt; smap
 Î»f.Îs,g.List s (Î»i.f (g i))</code></pre>
Index: sizechecking/README.txt
===================================================================
--- sizechecking/README.txt	(revision 10)
+++ sizechecking/README.txt	(revision 11)
@@ -2,9 +2,10 @@
 -------------
 
-You need at least version 2011.4.0.0 of haskell platform and the package
-value-supply. If you have haskell platform installed you can install
-value-supply by typing 
+You need at least version 2011.4.0.0 of the Haskell platform, an installed
+[Z3](http://research.microsoft.com/en-us/um/redmond/projects/z3/)
+and the packages `sbv` and `value-supply`. If you have a working Haskell platform installed you can
+install value-supply by typing
 
-	cabal install value-supply
+	cabal install value-supply sbv
 
 
@@ -25,5 +26,5 @@
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-$ ghci Examples.hs 
+$ ghci Examples.hs
 GHCi, version 7.0.4: http://www.haskell.org/ghc/  :? for help
 Loading package ghc-prim ... linking ... done.
@@ -36,5 +37,5 @@
 [4 of 4] Compiling Main             ( Examples.hs, interpreted )
 Ok, modules loaded: Lambda, SizedExp, Constraints, Main.
-*Main> 
+*Main>
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
@@ -79,5 +80,4 @@
 func $ a b
 ~~~~~~~~~~~~~~
-
 
 
@@ -130,6 +130,4 @@
   : embedding of the function application of our language to haskell
 
-There is also a function called `true` to denote we do not want to prove that
+There is also a function called `true` to denote that we do not want to prove that
 branch.
-
-
Index: sizechecking/Setup.hs
===================================================================
--- sizechecking/Setup.hs	(revision 11)
+++ sizechecking/Setup.hs	(revision 11)
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
Index: sizechecking/SizedExp.hs
===================================================================
--- sizechecking/SizedExp.hs	(revision 10)
+++ sizechecking/SizedExp.hs	(revision 11)
@@ -172,5 +172,5 @@
         putStrLn "QED"
         return True
-    else do
+      else do
         putStrLn "------------"
         putStrLn "Cannot prove: "
Index: sizechecking/Test.hs
===================================================================
--- sizechecking/Test.hs	(revision 11)
+++ sizechecking/Test.hs	(revision 11)
@@ -0,0 +1,3 @@
+module Main where
+import Examples (runTests)
+main=runTests
Index: sizechecking/sizechecking.cabal
===================================================================
--- sizechecking/sizechecking.cabal	(revision 11)
+++ sizechecking/sizechecking.cabal	(revision 11)
@@ -0,0 +1,58 @@
+-- Initial sizechecking.cabal generated by cabal init.  For further 
+-- documentation, see http://haskell.org/cabal/users-guide/
+
+-- The name of the package.
+name:                sizechecking
+
+-- The package version.  See the Haskell package versioning policy (PVP) 
+-- for standards guiding when and how versions should be incremented.
+-- http://www.haskell.org/haskellwiki/Package_versioning_policy
+-- PVP summary:      +-+------- breaking API changes
+--                   | | +----- non-breaking API additions
+--                   | | | +--- code changes with no API change
+version:             0.1.0.0
+
+-- A short (one-line) description of the package.
+-- synopsis:            
+
+-- A longer description of the package.
+-- description:         
+
+-- URL for the project homepage or repository.
+homepage:            kp.elte.hu/sizechecking
+
+-- The license under which the package is released.
+license:             BSD3
+
+-- The file containing the license text.
+license-file:        LICENSE
+
+-- The package author(s).
+author:              Attila Gobi
+
+-- An email address to which users can send suggestions, bug reports, and 
+-- patches.
+maintainer:          gobi@elte.hu
+
+-- A copyright notice.
+-- copyright:           
+
+category:            Testing
+
+build-type:          Simple
+
+-- Constraint on the version of Cabal needed to build this package.
+cabal-version:       >=1.8
+
+
+library
+  -- Modules exported by the library.
+  exposed-modules:     Constraints, SizedExp, Examples, Lambda
+  extensions: PatternGuards
+  
+  -- Modules included in this library but not exported.
+  -- other-modules:       
+  
+  -- Other library packages from which modules are imported.
+  build-depends:       base ==4.6.*, containers ==0.5.*, sbv, value-supply
+  
