Feature/521 addr settings 2

Addresses #520 and #526, and fixes a bug with the address verification settings testing.