tweaks to setting proxy values
code reorg