actually add storage helper, fix up some other stuff