WIP update the rest of the billing inputs this just needs a double check before a PR is made.