some fixes and visible back for devices