Adding service stop and fixing kill containers.