Removed redundant npc map
Removed bugs found in bugfinder