fixes and managestorage implementation