More Shop Tweaks