More mapping. ( Moved gold trader up the lighthouse ;) )