Move NodeAdmin to a more natural place for readability.
Clean up some out-of-date todos
Code cleanups: finals, visibility etc