fix for loss of settings (key overrides password)
minor updates