improved gen-certs