Make quantities integer, improve payment error handling