Cosmetic work on secret keyring
Cosmetic updates to server functions