Adjust delay, fix endpoints.