Fix management of mpk so we save it with pocket addresses when they are generated.
Fix comment.