Doc update and more work on the HTTP Handler