minor adjustments
use Long objects for amounts
do not prefill amount when 0