Changed neighbor definition. Consistency fixes.