Add some missing interfaces; alter handling of missing public_key
#16
+35
−2
public_key
#16