refactored PutRequest and PostRequest, cleanup
solving merge problems