* toying around * fix refs * remove unused fields * go further * add context * ensure streaming handler is set