Fix probleme when we stop program + small issue with setPayment Fixes #70