clean up remote command running
fix make-phar after removing /templates
cleanup, adding DRYness wishes