Bugfix, and some added feedback regarding proxy to use