NPCs fixes, updates and aditions

@ninjalulz I don't know if I did it right here, can you check? =P