added country to mail recipient.
some more minor adjustments.