#169 minor changes, name service timeout enlarged