fix a couple details, and use full key id