update RDoc and WIP