remove pin nametags + minor edits