fix in styles, service and better logs