#4 Moore neighborhood and other small improvements