more gpg touch ups