Worked on neighbours, fixed some errors