allow automatic choice of public / private keys on installation, minor bug-fixes