small changes, WIP for kill containers