more cleanup and added render-time header to add_handler response