some changes when fixing cases where the address wasn't getting pulled
correctly