fixing issue 28, hopefully. also, fixing up a keychain sync issue