moved private keys etc to private config file, other minor cleanup