diff --git a/Options.hs b/Options.hs
index 8538b7206..9ef8bed70 100644
--- a/Options.hs
+++ b/Options.hs
@@ -29,12 +29,12 @@ getOptions argv =
 get_content :: Flag -> Maybe String
 get_content (File s) = Just s
 
---defaultLedgerFile = expand "~/ledger.dat"
-defaultLedgerFile = "ledger.dat"
+defaultLedgerFile = "~/ledger.dat"
 
 getLedgerFilePath :: IO String
 getLedgerFilePath = do
-  getEnv "LEDGER" `catch` \_ -> return defaultLedgerFile >>= return
+  defaultpath <- tildeExpand defaultLedgerFile
+  getEnv "LEDGER" `catch` \_ -> return defaultpath >>= return
 
 -- ledger pattern args are a list of account patterns optionally followed
 -- by -- and a list of description patterns
diff --git a/TODO b/TODO
index 9812bd3b6..d54a04b07 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-environment
- robust ledger file finding
-
 features
  register
   svn-style truncation