* add upstream @self and loop count

* 1st round of feedback

* allow argless upstream

* update test

* readmes

* feedback