Fixed neighbor count, started better algo for checking neighbors