fixed HttpClient (still needs more work tho)