few fixes and service file