Added public key to computing plus some minor things