a whole bunch of doc updates
fixed the merge