Changed location of proxy.conf
Tweaks