more shop tweaks