Third commit of ShutDown, minor improvements.