stretchable storage, toggle refactor, minor fixes