Try hpx dataflow
Fix some errors due to copy/paste stuff