Wrap rpc calls and fixed minor bugs