Small tweaks on some NPC files, feel free to find any bug and report to ...

...me!
Only in local scopes as it is not needed in other parts.