QuickStore + minor fixes and refactoring.