fix bug on device manger... and more