PM's now work again, Merchants showing up from the start

And removed a return statement (which was out of place, as far as I
could tell)