Cleaned up how Encounters with NPCs are handled.
Cleaned up old comments
Removed unused method in Trader.