Updates to address, domain whitelist handling, additional arg handling

Updates to address, domain whitelist handling, additional arg handling