removed $(which) reference
added hostname for remote hosts