fixed tapping and threat on nameplates + cleanup