Performance: optimized neighbor search
Bugfix

Fields not displaying
Code cleanup