some cleanup/fixes/changes to ConfirmXyz-things