minor fixes and balances that are zero not added