merge the current fork

- rtools
- corrplor fixes
-test fixes