minor bug fixes and better slow response handing