Improved start and stop scripts