fix proxy bug, add additional comments