rewrote requests in Client, fixes #1 and #2