added add_address, bug fixes