Minor store picking algorithm refactoring; Change 'withInventory' option handling
Minor bug fixes.