just to keep the git streak going
Finished device part fixes
a few changes to storage but mostly device code