fix typo
improve waiting for service