fixes and a better try at the service