Minor fixes and rearrangements to help optimize the store!