Notes and Fixes to ease development in npcs.xml