added more response code fixes