more work on the keychain
more changes for keys, also a dump of db from tomcat