diff --git a/Options.hs b/Options.hs
index 3d2fc67a0..8538b7206 100644
--- a/Options.hs
+++ b/Options.hs
@@ -5,7 +5,6 @@ where
 import System.Console.GetOpt
 import Data.Maybe ( fromMaybe )
 import System.Environment (getEnv)
---import TildeExpand -- confuses my ghc 6.7
     
 import Utils
 
@@ -30,7 +29,7 @@ getOptions argv =
 get_content :: Flag -> Maybe String
 get_content (File s) = Just s
 
---defaultLedgerFile = tildeExpand "~/ledger.dat"
+--defaultLedgerFile = expand "~/ledger.dat"
 defaultLedgerFile = "ledger.dat"
 
 getLedgerFilePath :: IO String
diff --git a/TODO b/TODO
index c1ce05b7c..9812bd3b6 100644
--- a/TODO
+++ b/TODO
@@ -1,31 +1,31 @@
+environment
+ robust ledger file finding
+
 features
  register
-  description matching
-  regexp matching
-
+  svn-style truncation
  balance
   show top-level acct balances
   show all account balances
-
  print
- more directives, eg include
+ entry
+ -j and -J graph data output
+ !include
  read timelog files
  -p period expressions
  -d display expressions
- -j and -J graph data output
- graph automation
- auto entry generation
  read gnucash files
+ other args, directives
 
-testing
- ledger regression/compatibility tests
+new features
+ graph automation
+ smart data entry
 
-environment
- cleaner option processing
- robust ledger file finding
+tests
+ better use of quickcheck
+ ledger compatibility tests
 
-documentation
- --help
+docs
  literate docs
  haddock
 
diff --git a/Tests.hs b/Tests.hs
index e1d82a76f..091139bed 100644
--- a/Tests.hs
+++ b/Tests.hs
@@ -178,45 +178,6 @@ ledger7 = Ledger
                  }
           ]
 
--- 2007/01/02 * auto transfer to savings
---     assets:saving                            $200.00
---     assets:checking
-
--- 2007/01/03 * poquito mas
---     expenses:food:dining                       $4.82
---     assets:cash
-
--- 2007/01/03 * verizon
---     expenses:phone                            $95.11
---     assets:checking
-
--- 2007/01/03 * discover
---     liabilities:credit cards:discover         $80.00
---     assets:checking
-
--- 2007/01/04 * blue cross
---     expenses:health:insurance                 $90.00
---     assets:checking
-
--- 2007/01/05 * village market liquor
---     expenses:food:dining                       $6.48
---     assets:checking
-
---   parseTest ledgerentry entry2_str
---   parseTest ledgerentry entry3_str
---   parseTest ledgerperiodicentry periodic_entry1_str
---   parseTest ledgerperiodicentry periodic_entry2_str
---   parseTest ledgerperiodicentry periodic_entry3_str
---   parseTest ledger ledger1_str
---   parseTest ledger ledger2_str
---   parseTest ledger ledger3_str
---   parseTest ledger ledger4_str
---   parseTest ledger ledger5_str
---   parseTest ledger ledger6_str
---   parseTest ledger periodic_entry1_str
---   parseTest ledger periodic_entry2_str
---   parseLedgerFile ledgerFilePath >>= printParseResult
-
 -- utils
 
 assertEqual' e a = assertEqual "" e a