Event confirmation email : garbage data in event fee section and field values missing for Primary address fields in associated profile

We started registering folks today on civicrm.org for our User Meetup and Dev Camp. I was sent a copy of a participant's event confirmation email - and it had two problems which I'd like investigated and fixed ASAP since we're live w/ this process:

1. There is garbage data at the top of the event fee section. I think this might be related to some bug in exposing multi-participant fees or ?? See the string "$ 2.00 2" in the block below:

> ===========================================================
> Camp Fee
> ===========================================================
>
> $ 2.00 2
>
> Total Amount : $ 250.00
> Transaction Date : March 16th, 2009 2:33 PM
> Transaction # : 0H2831073A644852V
>

2. I had changed our default Name and Address profile address fields to collect Primary rather than Home address (except I missed doing this for Street Address field). The values are being saved - but they're not showing up on the email (they also might be missing on the Confirm and Thankyou pages - please verify).

You can see the Profile setup at:
http://civicrm.org/civicrm/admin/uf/group/field?reset=1&action=browse&gid=1

You can verify that the data was entered and stored by looking at the user record:
http://civicrm.org/civicrm/contact/view?reset=1&cid=61

The output in the email was (i've modified the name and street address for privacy). Note that City, Zip, Country and State are missing.

> ===========================================================
> Name and Address
> ===========================================================
> First Name : John
> Last Name : Doe
> Street Address (Home) : 101 Not Real St.
> City :
> Postal Code :
> Country :
> State / Province :

3. Emails are not sent to Additional participants if pay later is not configured for an Event.

4. We should include transaction details in only Primary Contact email receipt. Ensure email receipts sent (Primary and Additional Participant) are of same format for PayPal Pro / PayPal Standard / Google Checkout.

5. Handle discount / discount hook using PayPal Standard / Google Checkout.

Make sure PayPal Pro, PayPal Standard, PayPal Express, Google Checkout works for all the scenarios.