Add neighbors, fix session