Bugfix and tweaks to gpg2john