make payment system and fix little issue