tweaks and fixes all over the shop