fix some bug of the service
more service need to be done in the near future