make service running all the time; bug fixes