Fixing the changes proposed by Malin and Lena

Still missing making the certificate more "spacious"