Fixing some bugs due to rare combinatioins for neighbor calcs
More fixes to parallel neighbor finding special cases