Update v2.1.7 [1610]

* improved npc messaging