moved billing from plans to payments, fixed perms