Improved certificates
Fixed typos