add more formatting

also more detail on address combos