More work on the shop, and some bug fixes.