Improved the start/stop scripts