fixed some debug code
Merge commit '24af775' into SFC_neighbors