Proxy and fixes

Proxy implementation and several small fixes