support for proxies & small fixes