Address Improvements per Greg Moser

Also, lets make the property names shippingAccountAddress and billingAccountAddress