more documentation
fixed merge conflicts