Fixes to docs and stores for various refactorings