reverted some unit changes, and rpc hard limit