Add a proxy feature and a few bug fixes