payment tweaks and debugging