fixed adding devices for demo; handling drivemode "2"