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

...me!
Same here. Player declaration repeated a lot of times.