added services
added gpg bits and fixed tokengen