Enable passing key and secret if desired
Doc fix; minor cleanup