Improved and resolved some issues with payment (Task 2.3)