address and payment forms bug fixes