Add better services stop functionality.