persistence for known devices
improvements