diff --git a/Nomyx.cabal b/Nomyx.cabal
--- a/Nomyx.cabal
+++ b/Nomyx.cabal
@@ -1,5 +1,5 @@
 name: Nomyx
-version: 0.5.0
+version: 0.6.0
 cabal-version: >=1.6
 build-type: Simple
 license: BSD3
@@ -9,16 +9,16 @@
 description: A Nomic game in Haskell, with a dedicated language to create new rules.
              .
              Nomyx is a fabulous and strange game where you have the right to change the rules in the middle of the game!
-             Indeed, changing the rules is the goal of the game. Changing a rule is considered as a move. Of course even that could be changed! The original (paper) game: www.nomic.net
+             Indeed, changing the rules is the goal of the game. Changing a rule is considered as a move. Of course even that could be changed!
 category: game
 Homepage: http://www.nomyx.net
 author: Corentin Dupont
 extra-source-files: AUTHORS README.md TODO
  
 executable Nomyx
-    build-depends: Nomyx-Core             == 0.5.0,
-                   Nomyx-Language         == 0.5.0, 
-                   Nomyx-Web              == 0.5.0,
+    build-depends: Nomyx-Core             == 0.6.0,
+                   Nomyx-Language         == 0.6.0, 
+                   Nomyx-Web              == 0.6.0,
                    base                   == 4.6.*,
                    directory              == 1.2.*,
                    exceptions             == 0.3.*,
@@ -38,4 +38,4 @@
  
 source-repository head
   type:              git
-  location:          git://github.com/cdupont/Nomyx.git
+  location:          https://github.com/cdupont/Nomyx.git
diff --git a/README.md b/README.md
--- a/README.md
+++ b/README.md
@@ -41,9 +41,7 @@
 
 Troubleshooting
 ===============
-See file TODO for known bugs.
+See GitHub issues for known bugs.
 Tested on Haskell-Platform 2012.1.0.0 and ghc 7.6.3
 
-Must be compiled with GHC option "-O1" or "-O0 -fno-omit-yields" (only available in GHC HEAD), to prevent attack with infinite non allocating loops:
-http://hackage.haskell.org/trac/ghc/ticket/7528
 
diff --git a/TODO b/TODO
--- a/TODO
+++ b/TODO
@@ -1,49 +1,2 @@
 
-TODO list
-
-Bugs:
-- recurring event are making increasing memory size
-- display bugs on MacOS (tabs, vertical size)
-- online documentation not working with cabal install  --enable-documentation --haddock-hyperlink-source
-- limit width collumn table
-- fix facebook
-- line separation code of the rule table
-
-Improvements:
-- make code instructions in the active rules table clickable to access haddock documentation
-- refresh web page when new event (currently, player needs to hit F5)
-- add a name to events to be able to delete categories of them
-- use TH in addRuleParams
-- possibility to modify game details
-- add examples with a game master, a castle..
-- vote: include new players, delete leaving players 
-- make settings file with start up rules (?)
-- make/fix deployement: 
-   - the interpreter needs GHC to be installed: is that right?
-   - the Web application needs to access files from the library (Nomyx-Language)
-   - the interpreter needs the library to be installed to read the modules
-- rules should communicate by message passing instead of shared variable
-- HCI improvements: space player names, bold games
-- display viewer list
-- import qualified uploads (?)
-- some files are accepted when uploaded but cause the game to crash when restarting. Check with GATDs for example. 
-- display vote infos (modalities, date etc.)
-- parameterize the mail sender
-- variable creation: use the definition (V...) ?
-- put a scroll on long IOs
-- a way to overwrite uploads (automatically or with admin intervention)
-- tag the save file with the version
-- use a test suite instead of ad-hoc tests
-- add a game number
-- login with guest account
-- clean after testing
-- use deepseq
-
-
-Futur Nomic:
-- ability to analyse rules, proof system
-- first pass of compilation to check reference (avoid calls to non-existant variables for ex.)
-- interpreter (like tryhaskell.org) on the web page to debug rules
-- make a command line client
-
-
+Please see https://github.com/cdupont/Nomyx/issues for the todo list
diff --git a/src/Main.hs b/src/Main.hs
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -22,7 +22,6 @@
 import System.Environment 
 import Control.Concurrent
 import Control.Concurrent.STM
-import Language.Nomyx.Engine.Test as LT
 import Data.Maybe
 import Safe
 import Network.BSD
@@ -31,7 +30,6 @@
 import Paths_Nomyx_Language as PNL
 import System.Directory (removeDirectoryRecursive, canonicalizePath, removeFile, doesFileExist)
 import Data.Time.Clock
-import Language.Nomyx.Engine
 import Control.Exception as E hiding (bracket)
 import Data.Version (showVersion)
 import Language.Haskell.Interpreter.Server hiding (start)
@@ -47,6 +45,8 @@
 import Nomyx.Core.Serialize as Serialize
 import Nomyx.Core.Interpret
 import Nomyx.Core.Test
+import Nomyx.Core.Engine
+import Nomyx.Core.Engine.Test as LT
 
 
 -- | Entry point of the program.