[#801] a more precise kill and some extra comments