node registration, other minor changes