addr info added, still some bugs