Fix to return to the root of the device storage when switching to it
+ a few comments in the code