Correct variable reference, fix vcard output