added ServiceDelegate + some fix2