Changed some items

In preparation of the merchant hall