Map changes, misc changes

Bradens work, also fixed addon issue for npcs just taking money and not
giving addon.