Fix entity clearing, tweak signs