further improvements to certificates