Tidy up client script
add hotplug