Death fixes + cleanup;