Syntax fixes, service.pp integration