A few tweaks to dropping and name tag rendering