Change how initial billing plan is selected

Also, remove global reference, add more card error reporting