fixed some payment and subscription issues