minor fixes due to new structure/naming, added Keys, Device