fix die removed
misc fixes