cert3 plus some fixes