Fixing bugs in proxy, added cmd tools