wip
fixes to gpg