Finish features of R++