Make config.Address accessible, general tidy up