reorganizing a bit; + gpg-agent