misc fixes/tweaks to further parse NPSP classes.