code correction and supported devices improvement