some more nil table and unit death precautions
better start
merged