prepare for merge
merging
Prepare for pull
Neighbours adding works perfcetly, even for corners
minor changes