tidy up some documentation
merge conflict