Keystore stuff, and Javadocs