added fixes to payment and billing plan