Added devices, updated others