address handling improved