More shop improvements