Even more changes for the shop and pre-orders