Bug fixes to the address table populator, which is working now.