diff --git a/ChangeLog b/ChangeLog
index 2fbeab4..0a845ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 NEXT
-	Added JSON key export support using libjansson.
+	Added JSON output support using libjansson (-j),
+	supported by -t, -p and -s.
 
 	Abandoned YAML, perl and C key export support,
 	better doing one external format but doing it
@@ -9,7 +10,7 @@ NEXT
 	Removed -y for YAML vault export as well. Maybe
 	I'll add a parameter to -p or -s so one can
 	select which key[s] to export.
-	
+
 	removed hand-written padding stuff and using
 	libsodiums _easy() functions for crypto now
 	instead of the raw nacl ones. instead we use
diff --git a/INSTALL b/INSTALL
index 6e90e07..2099840 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,7 +1,7 @@
 Installation Instructions
 *************************
 
-Copyright (C) 1994-1996, 1999-2002, 2004-2012 Free Software Foundation,
+Copyright (C) 1994-1996, 1999-2002, 2004-2013 Free Software Foundation,
 Inc.
 
    Copying and distribution of this file, with or without modification,
@@ -12,8 +12,8 @@ without warranty of any kind.
 Basic Installation
 ==================
 
-   Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package.  The following
+   Briefly, the shell command `./configure && make && make install'
+should configure, build, and install this package.  The following
 more-detailed instructions are generic; see the `README' file for
 instructions specific to this package.  Some packages provide this
 `INSTALL' file but do not implement all of the features documented
diff --git a/TODO b/TODO
index c267ab5..9b72f48 100644
--- a/TODO
+++ b/TODO
@@ -1,7 +1,5 @@
 JSON:
-- export secret as json
 - import pub und secret as json
-- export vault as json
 
 detach keysig generation from pub key export, so that an existing
 keysig can be verified later.
@@ -18,8 +16,6 @@ Update pod key format spec.
 
 vault checksum: add keysigs as well
 
-enable formats for secret key exports as well
-
 Add newlines to headers in define.h, so strlen() later catches the whole length.
 
 Check is_utf8 license.
@@ -32,35 +28,4 @@ pcp_find_primary_secret() makes a copy ???
 c++ destructor double free mess
 
 cpptest 0 uses same Context for encryptor and decryptor,
-must be another one for the latter!
-
-after new z85 padding scheme: write z85 blocksize to output
-as well? if a reader doesn't know the blocksize it won't be
-able to decode it properly. Or no issue? Not sure yet...
-
-
-(gdb) set args  -V v1 -p -x xxx -z -i 0x8671F4264E20F179
-(gdb) r
-Starting program: /usr/home/sciplocal/D/github/pcp/src/pcp1 -V v1 -p -x xxx -z -i 0x8671F4264E20F179
-failed to decrypt the secret key (got -1, expected 32)!
-Error: Operation not permitted
-
-Program received signal SIGSEGV, Segmentation fault.
-0x000000000040f8e8 in pcphash_del (ptx=0x801017040, key=0x80107b100, type=Variable "type" is not available.
-) at keyhash.c:28
-28          HASH_DEL(ptx->pcpkey_hash, (pcp_key_t *)key);
-(gdb) bt
-#0  0x000000000040f8e8 in pcphash_del (ptx=0x801017040, key=0x80107b100, type=Variable "type" is not available.
-) at keyhash.c:28
-#1  0x000000000040fba7 in pcphash_clean (ptx=0x801017040) at keyhash.c:50
-#2  0x00000000004084ff in ptx_clean (ptx=0x801017040) at context.c:52
-#3  0x0000000000402557 in main (argc=Variable "argc" is not available.
-) at pcp.c:593
-
-
-
-
-_havenacl sometimes "no", even if old version is installed, followed by:
-
-mem.c:51: warning: implicit declaration of function 'sodium_malloc'
-mem.c:51: warning: initialization makes pointer from integer without a cast
+must be another one for the latter!
\ No newline at end of file