Main NPC UPDT

as it says.. trying to make it like official one (?)