keychain improvements