removed service package, some generic fixes