fix some glaring issues with payment collection