Added remote host, mac support
Fixed to spurious Id problem