fixing things up and adding in proxy stuff,