Info within e-mail

Hello

I am trying to get the email to show the full information of the following

1. Address, - This only shows the main parts of the address, could you get it to show the full address?
2. customers email address. - (could this be in the From email) so that rather than the emails saying from "Draganfly Motorcycles" could it say from "Mr A Smith?
3. Credit Card number - See below

I have been playing around with the email settings and I want it to show the full card number in the email which I receive. I tried changing the following line

echo "<br/>".JText::_('END_OF_CREDIT_CARD_NUMBER').' : '.substr($data->credit_card_info->cc_number,;

so that at the end it changed from ,; to ,16); this was far too simple and thus didn't work. I read in another post that changing the Credit card plugin was needed to get the full credit card number. Could someone please point me in the right direction.

Yours
Iain

Happy new year HikaShop.