bug fix on proxy + add comments