Minor adjustments
Gulps
Import stash :/
Fix on_return in non-tail case
Reenable selection of settings according to envvar