Bringing the grid-stop script up to speed.  Some minor cleanup as well.