small changes in control scripts and upstart script