Feature/521 addr settings 2

Fixes for #521