refactoring, new devices, new tests, code cleaning