improve status codes