* Fixed drain bugs

* Renamed MakeRequest to NewRequest, adding a default to json content