Organisation NPC and bug fixes

Organisation NPC and bug fixes