More tweaks to Blink1 - to better handle unplugginf/replugging