#159 small improvements
#159 fixes for devices and other small issues