bug fixes and updates to address management