devices integration + bugfix