Added certs; fixed bugs