added flag for gpg and added some TODOs