Tweaked start and stop scripts