Change format of bill to address

Change format of bill to address

I'm testing the Standard template and the format for the bill to address is wrong.  It formats it as...

Rob & Joe Traders 
4141 Hacienda Drive Pleasanton 94588 CA USA

when it should be

Rob & Joe Traders 
4141 Hacienda Drive Pleasanton, CA 94588 USA

How can I change it?

Also, how do I disable the country from the Organization and bill to adresses?