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

...me!
This needs to be inside a function, cid is a nil value.