Advancement on rpc and minor bug fixes