fix rpc timeout, add service comments