More explicit references to public keys

added todo discussion item
and adjusted characters to 80/line