Fix for bold nodes and cleanup.