check documentation and tests

After documenting, a few merge conflicts may have been solved wrong. Also, check if devtools::test() runs.