Fix response handling, fix typos