dependencies + address input
Several small changes