squash a bunch of updates of from showp1984 for his hotplug