Fixed nearest neighbour
Fixed some comments