Support new devices + bug fix