Add keychain stuff, minor fixes.