Improved speed of NPAHierarchy, bugfix in WState