fixed to match new rpc entry names.
adapted to the new rpc return values.