improvements and bug fixes

support for newer devices