add entry for public key encryption key; bugfix in retrieve token value;