Add Herro as a service (not yet activated)
Minor fixes