adding devices and fixing their creation