small fixes to address generator and listAddresses2