1. add number info. 2. better address interpretation