Bug fixes in PreferredNeighborBLAHBLAHBLAH