Fixed bugs for storage andload loading from storage.
Stuff, ncie stuff, yeah. Just a merge actually.