fixed really nasty bug related to PointsToQueryWrapper in CombinedPathAndPointsToQuery...was keeping bad reference to old parent class via inner class semantics. Have refactored PointsToQueryWrapper to be a static inner class and fixed the bug