device activation fixes
device import enhancement