More cleaning up of Node structure, improved public methods