Remove a couple of spaces and fix one case error in shops

When I rewrote the code for the shop parser,
it was much simpler to change these two NPCs than
try to preserve the exact parsing behavior.

The item case error, on the other hand, was just plain wrong.