use node names instead of tags

Tags are not available during bootstrap.
Misc cleanup.
docs